update with latest from master

developmentseed · Aug 20, 2021 · 417a3c3 · 417a3c3
2 parents eaa0e13 + 10e8537
commit 417a3c3
Show file tree

Hide file tree

Showing 24 changed files with 807 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# PyCharm:
+.idea
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,27 @@
 
+## 2.1.4 (2021-08-20)
+
+* add **NZTM2000Quad** tile matrix set from LINZ (author @blacha, https://github.com/developmentseed/morecantile/pull/57)
+* add **quadkey** supports (@author adrian-knauer, https://github.com/developmentseed/morecantile/pull/56)
+
+    ```python
+    import morecantile
+
+    tms = morecantile.tms.get("WebMercatorQuad")
+
+    # Tile to Quadkey
+    tms.quadkey(486, 332, 10)
+    >>> "0313102310"
+
+    # Quadkey to Tile
+    tms.quadkey_to_tile("0313102310")
+    >>> Tile(486, 332, 10)
+    ```
+
+* update `NZTM2000*` CRS uri from `https://www.opengis.net/def/crs/EPSG/0/2193` to `urn:ogc:def:crs:EPSG:2193` (https://github.com/developmentseed/morecantile/pull/61)
+
+## 2.1.3 - Doesn't exists
+
 ## 2.1.2 (2021-05-18)
 
 * fix wrong TMS boundingBox definition when using inverted CRS (https://github.com/developmentseed/morecantile/pull/53)

diff --git a/README.md b/README.md
@@ -70,6 +70,7 @@ $ pip install git+https://github.com/developmentseed/morecantile.git
 - **EuropeanETRS89_LAEAQuad**: ETRS89-extended / LAEA Europe - EPGS:3035
 - **LINZAntarticaMapTilegrid**: LINZ Antarctic Map Tile Grid (Ross Sea Region) - EPSG:5482
 - **NZTM2000**: LINZ NZTM2000 Map Tile Grid - EPSG:2193
+- **NZTM2000Quad**: LINZ NZTM2000 Map Tile Grid - EPSG:2193
 - **UPSAntarcticWGS84Quad**: Universal Polar Stereographic WGS 84 Quad for Antarctic - EPSG:5042
 - **UPSArcticWGS84Quad**: Universal Polar Stereographic WGS 84 Quad for Arctic - EPSG:5041
 - **UTM31WGS84Quad**: Example of UTM grid - EPSG:32631

diff --git a/docs/cli.md b/docs/cli.md
@@ -51,6 +51,7 @@ Options:
                 - CanadianNAD83_LCC
                 - UPSArcticWGS84Quad
                 - NZTM2000
+                - NZTM2000Quad
                 - UTM31WGS84Quad
                 - UPSAntarcticWGS84Quad
                 - WorldMercatorWGS84Quad
@@ -91,6 +92,7 @@ Options:
                 - CanadianNAD83_LCC
                 - UPSArcticWGS84Quad
                 - NZTM2000
+                - NZTM2000Quad
                 - UTM31WGS84Quad
                 - UPSAntarcticWGS84Quad
                 - WorldMercatorWGS84Quad
@@ -149,6 +151,7 @@ Options:
                 - CanadianNAD83_LCC
                 - UPSArcticWGS84Quad
                 - NZTM2000
+                - NZTM2000Quad
                 - UTM31WGS84Quad
                 - UPSAntarcticWGS84Quad
                 - WorldMercatorWGS84Quad

diff --git a/docs/usage.md b/docs/usage.md
@@ -10,6 +10,7 @@ print(morecantile.tms.list())
     'CanadianNAD83_LCC',
     'UPSArcticWGS84Quad',
     'NZTM2000',
+    'NZTM2000Quad',
     'UTM31WGS84Quad',
     'UPSAntarcticWGS84Quad',
     'WorldMercatorWGS84Quad',

diff --git a/morecantile/__init__.py b/morecantile/__init__.py
@@ -8,7 +8,7 @@
 
 """
 
-__version__ = "2.1.2"
+__version__ = "2.1.4"
 
 from .commons import BoundingBox, Coords, Tile  # noqa
 from .defaults import tms  # noqa

diff --git a/morecantile/data/CanadianNAD83_LCC.json b/morecantile/data/CanadianNAD83_LCC.json
@@ -4,7 +4,7 @@
     "identifier": "CanadianNAD83_LCC",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/3978",
+        "crs": "urn:ogc:def:crs:EPSG::3978",
         "lowerCorner": [
             -7786476.885838887,
             -5153821.09213678
@@ -14,7 +14,7 @@
             7928343.534071138
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/3978",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::3978",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -355,4 +355,4 @@
             "matrixHeight": 2625811
         }
     ]
-}
+}
diff --git a/morecantile/data/EuropeanETRS89_LAEAQuad.json b/morecantile/data/EuropeanETRS89_LAEAQuad.json
@@ -4,7 +4,7 @@
     "identifier": "EuropeanETRS89_LAEAQuad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/3035",
+        "crs": "urn:ogc:def:crs:EPSG::3035",
         "lowerCorner": [
             1000000.0,
             2000000.0
@@ -14,7 +14,7 @@
             5500000.0
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/3035",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::3035",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -225,4 +225,4 @@
             "matrixHeight": 32768
         }
     ]
-}
+}
diff --git a/morecantile/data/LINZAntarticaMapTilegrid.json b/morecantile/data/LINZAntarticaMapTilegrid.json
@@ -2,7 +2,7 @@
     "type": "TileMatrixSetType",
     "title": "LINZ Antarctic Map Tile Grid (Ross Sea Region)",
     "identifier": "LINZAntarticaMapTilegrid",
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/5482",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::5482",
     "tileMatrix": [
         {
             "type": "TileMatrixType",

diff --git a/morecantile/data/NZTM2000.json b/morecantile/data/NZTM2000.json
@@ -3,10 +3,10 @@
     "title": "LINZ NZTM2000 Map Tile Grid",
     "abstract": "See https://www.linz.govt.nz/data/linz-data-service/guides-and-documentation/nztm2000-map-tile-service-schema",
     "identifier": "NZTM2000",
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/2193",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::2193",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/2193",
+        "crs": "urn:ogc:def:crs:EPSG::2193",
         "lowerCorner": [
             3087000,
             274000
@@ -239,4 +239,4 @@
             "matrixHeight": 512000
         }
     ]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,3 +127,6 @@ dmypy.json @@
     # Pyre type checker
     .pyre/
+    # PyCharm:
+    .idea