Locations between Lavos and Leiria, Portugal

I'm trying to narrow down a couple of locations on Wellesley's march from Lavos in 1808.

He orders Fane to march to St Giao on 9th August⁠, which I can find on Faden's 1810 map, but then I can't find it on modern maps. Could it be Giao?

Also, the camp site on 10th August Wellesley describes as 'at Lugar, about 8 miles north of Leiria.' Wyld's Atlas places this near two settlements called Marinha de S. Juan and S. Juan de Rua. Which, again, I can't find.

I've added a section of Wyld's map below. North is to the left.

Any help locating both locations on a modern map would be much appreciated.