Merge branch 'main' into dependabot/go_modules/tile_server/gridserver…

…/golang.org/x/image-0.10.0
google · Apr 10, 2024 · 96510ed · 96510ed
2 parents 400eae4 + 7dc3b4c
commit 96510ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ previous area. And so on - each pair of digits reduces the area to
 1/400th of the previous area.
 
 As an example, the Parliament Buildings in Nairobi, Kenya are located at
-6GCRPR6C+24. 6GCR is the area from 2S 36E to 1S 37E. PR6C+24 is a 14 meter
-wide by 14 meter high area within 6GCR.
+6GCRPR6C+24. 6GCR is the area from 2°S 36°E to 1°S 37°E. PR6C+24 is a 14
+by 14 meter wide area within 6GCR.
 
 A "+" character is used after eight digits, to break the code up into two parts
 and to distinguish codes from postal codes.

diff --git a/cpp/openlocationcode.cc b/cpp/openlocationcode.cc
@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 
 #include "codearea.h"