From b35ce4a009d275bc0b221e2313cb573b3b2512bb Mon Sep 17 00:00:00 2001 From: Galen CC Date: Wed, 19 Mar 2025 13:28:49 -0400 Subject: [PATCH 1/4] Add Canada Ontario 2018-2022 orthoimagery Signed-off-by: Galen CC --- .../ca/Ontario_Mosaic_2018-2022.geojson | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson diff --git a/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson b/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson new file mode 100644 index 000000000..b21886a5e --- /dev/null +++ b/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson @@ -0,0 +1,140 @@ +{ + "type": "Feature", + "properties": { + "id": "Ontario_Mosaic_2018-2022", + "attribution": { + "url": "https://www.ontario.ca/page/open-government-licence-ontario", + "text": "Contains information licensed under the Open Government Licence – Ontario", + "required": true + }, + "name": "Ontario Orthophotography Mosaic 2018-2022", + "url": "https://ws.geoservices.lrc.gov.on.ca/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer?request=GetCapabilities&service=WMS", + "max_zoom": 20, + "license_url": "https://osmfoundation.org/wiki/OGL_Canada_and_local_variants", + "permission_osm": "implicit", + "country_code": "CA", + "type": "wms_endpoint", + "available_projections": [ + "CRS:84", + "EPSG:3857", + "EPSG:4326" + ], + "description": "Image mosaic covering all spring image acquisition areas in Ontario from 2018-2022", + "category": "photo", + "valid-georeference": true, + "privacy_policy_url": "https://www.ontario.ca/page/privacy-statement", + "start_date": "2018-03-22", + "end_date": "2022-11-02", + "default-layers": [ + { + "layer": { + "name": "GEO_Imagery_Data_Service_2018to2022", + "style": "default" + } + } + ] + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -83.30731126331, + 41.96391883995 + ], + [ + -83.18305333795, + 42.36142339729 + ], + [ + -82.80401318863, + 42.46685608612 + ], + [ + -82.47238520342, + 43.10756679751 + ], + [ + -81.85109557660, + 43.41712830707 + ], + [ + -81.88110900878, + 44.20977652443 + ], + [ + -81.46362854003, + 44.69209194679 + ], + [ + -82.30957580566, + 45.52559633622 + ], + [ + -84.59131636529, + 46.15794585975 + ], + [ + -85.42842238879, + 47.71182754912 + ], + [ + -87.40782934019, + 48.46899192132 + ], + [ + -89.85169006347, + 47.73563274593 + ], + [ + -90.32898056802, + 48.96376551372 + ], + [ + -86.66664171522, + 50.57428674334 + ], + [ + -79.24604561107, + 48.49789110776 + ], + [ + -79.25476546549, + 46.73473223778 + ], + [ + -74.19288561971, + 45.72134361398 + ], + [ + -74.20160547413, + 45.01994686320 + ], + [ + -76.84372136079, + 43.72354147205 + ], + [ + -78.64625324949, + 43.70828910383 + ], + [ + -78.88502612912, + 42.63829049506 + ], + [ + -80.98899585111, + 42.39598097731 + ], + [ + -82.68116886765, + 41.57546367267 + ], + [ + -83.30731126331, + 41.96391883995 + ] + ] + ] + } +} From 8559110d6cc990578ae966ad17203de95bba1a32 Mon Sep 17 00:00:00 2001 From: Galen CC Date: Sat, 22 Mar 2025 13:39:45 -0400 Subject: [PATCH 2/4] CA: Ontario Mosaic: reorder geometry polygon to respect RHR Signed-off-by: Galen CC --- .../ca/Ontario_Mosaic_2018-2022.geojson | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson b/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson index b21886a5e..56269fe96 100644 --- a/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson +++ b/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson @@ -43,92 +43,92 @@ 41.96391883995 ], [ - -83.18305333795, - 42.36142339729 - ], - [ - -82.80401318863, - 42.46685608612 + -82.68116886765, + 41.57546367267 ], [ - -82.47238520342, - 43.10756679751 + -80.98899585111, + 42.39598097731 ], [ - -81.85109557660, - 43.41712830707 + -78.88502612912, + 42.63829049506 ], [ - -81.88110900878, - 44.20977652443 + -78.64625324949, + 43.70828910383 ], [ - -81.46362854003, - 44.69209194679 + -76.84372136079, + 43.72354147205 ], [ - -82.30957580566, - 45.52559633622 + -74.20160547413, + 45.0199468632 ], [ - -84.59131636529, - 46.15794585975 + -74.19288561971, + 45.72134361398 ], [ - -85.42842238879, - 47.71182754912 + -79.25476546549, + 46.73473223778 ], [ - -87.40782934019, - 48.46899192132 + -79.24604561107, + 48.49789110776 ], [ - -89.85169006347, - 47.73563274593 + -86.66664171522, + 50.57428674334 ], [ -90.32898056802, 48.96376551372 ], [ - -86.66664171522, - 50.57428674334 + -89.85169006347, + 47.73563274593 ], [ - -79.24604561107, - 48.49789110776 + -87.40782934019, + 48.46899192132 ], [ - -79.25476546549, - 46.73473223778 + -85.42842238879, + 47.71182754912 ], [ - -74.19288561971, - 45.72134361398 + -84.59131636529, + 46.15794585975 ], [ - -74.20160547413, - 45.01994686320 + -82.30957580566, + 45.52559633622 ], [ - -76.84372136079, - 43.72354147205 + -81.46362854003, + 44.69209194679 ], [ - -78.64625324949, - 43.70828910383 + -81.88110900878, + 44.20977652443 ], [ - -78.88502612912, - 42.63829049506 + -81.8510955766, + 43.41712830707 ], [ - -80.98899585111, - 42.39598097731 + -82.47238520342, + 43.10756679751 ], [ - -82.68116886765, - 41.57546367267 + -82.80401318863, + 42.46685608612 + ], + [ + -83.18305333795, + 42.36142339729 ], [ -83.30731126331, From c18c8fb17ab7aa06aa1ed1965af69c274678b47e Mon Sep 17 00:00:00 2001 From: arch0345 Date: Sun, 23 Mar 2025 20:05:23 -0700 Subject: [PATCH 3/4] Convert wms_endpoint to wms layers Also moved all Ontario related layers into its own subfolder --- .../CityofTorontoImageryLatest.geojson | 0 .../{ => on}/Ontario_Mosaic_2018-2022.geojson | 20 +-- .../on/Ontario_Mosaic_2018-2022_CIR.geojson | 132 ++++++++++++++++++ 3 files changed, 138 insertions(+), 14 deletions(-) rename sources/north-america/ca/{ => on}/CityofTorontoImageryLatest.geojson (100%) rename sources/north-america/ca/{ => on}/Ontario_Mosaic_2018-2022.geojson (83%) create mode 100644 sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson diff --git a/sources/north-america/ca/CityofTorontoImageryLatest.geojson b/sources/north-america/ca/on/CityofTorontoImageryLatest.geojson similarity index 100% rename from sources/north-america/ca/CityofTorontoImageryLatest.geojson rename to sources/north-america/ca/on/CityofTorontoImageryLatest.geojson diff --git a/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022.geojson similarity index 83% rename from sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson rename to sources/north-america/ca/on/Ontario_Mosaic_2018-2022.geojson index 56269fe96..19d9ff337 100644 --- a/sources/north-america/ca/Ontario_Mosaic_2018-2022.geojson +++ b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022.geojson @@ -1,38 +1,30 @@ { "type": "Feature", "properties": { - "id": "Ontario_Mosaic_2018-2022", + "id": "Ontario_Mosaic_2018-2022_RGB", "attribution": { "url": "https://www.ontario.ca/page/open-government-licence-ontario", "text": "Contains information licensed under the Open Government Licence – Ontario", "required": true }, - "name": "Ontario Orthophotography Mosaic 2018-2022", - "url": "https://ws.geoservices.lrc.gov.on.ca/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer?request=GetCapabilities&service=WMS", + "name": "Ontario Orthophotography Mosaic 2018-2022 (RGB)", + "url": "https://ws.geoservices.lrc.gov.on.ca:443/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer/?FORMAT=image/jpeg&TRANSPARENT=TRUE&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&LAYERS=GEO_Imagery_Data_Service_2018to2022:None&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}", "max_zoom": 20, "license_url": "https://osmfoundation.org/wiki/OGL_Canada_and_local_variants", "permission_osm": "implicit", "country_code": "CA", - "type": "wms_endpoint", + "type": "wms", "available_projections": [ "CRS:84", "EPSG:3857", "EPSG:4326" ], - "description": "Image mosaic covering all spring image acquisition areas in Ontario from 2018-2022", + "description": "Natural color image mosaic covering all spring image acquisition areas in Ontario from 2018-2022", "category": "photo", "valid-georeference": true, "privacy_policy_url": "https://www.ontario.ca/page/privacy-statement", "start_date": "2018-03-22", - "end_date": "2022-11-02", - "default-layers": [ - { - "layer": { - "name": "GEO_Imagery_Data_Service_2018to2022", - "style": "default" - } - } - ] + "end_date": "2022-11-02" }, "geometry": { "type": "Polygon", diff --git a/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson new file mode 100644 index 000000000..9bcabf910 --- /dev/null +++ b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson @@ -0,0 +1,132 @@ +{ + "type": "Feature", + "properties": { + "id": "Ontario_Mosaic_2018-2022_CIR", + "attribution": { + "url": "https://www.ontario.ca/page/open-government-licence-ontario", + "text": "Contains information licensed under the Open Government Licence – Ontario", + "required": true + }, + "name": "Ontario Orthophotography Mosaic 2018-2022 (CIR)", + "url": "https://ws.geoservices.lrc.gov.on.ca:443/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer/?FORMAT=image/jpeg&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&LAYERS=GEO_Imagery_Data_Service_2018to2022:NaturalResource_FalseColourComposite&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}", + "max_zoom": 20, + "license_url": "https://osmfoundation.org/wiki/OGL_Canada_and_local_variants", + "permission_osm": "implicit", + "country_code": "CA", + "type": "wms", + "available_projections": [ + "CRS:84", + "EPSG:3857", + "EPSG:4326" + ], + "description": "Color-infrared image mosaic covering all spring image acquisition areas in Ontario from 2018-2022", + "category": "photo", + "valid-georeference": true, + "privacy_policy_url": "https://www.ontario.ca/page/privacy-statement", + "start_date": "2018-03-22", + "end_date": "2022-11-02" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -83.30731126331, + 41.96391883995 + ], + [ + -82.68116886765, + 41.57546367267 + ], + [ + -80.98899585111, + 42.39598097731 + ], + [ + -78.88502612912, + 42.63829049506 + ], + [ + -78.64625324949, + 43.70828910383 + ], + [ + -76.84372136079, + 43.72354147205 + ], + [ + -74.20160547413, + 45.0199468632 + ], + [ + -74.19288561971, + 45.72134361398 + ], + [ + -79.25476546549, + 46.73473223778 + ], + [ + -79.24604561107, + 48.49789110776 + ], + [ + -86.66664171522, + 50.57428674334 + ], + [ + -90.32898056802, + 48.96376551372 + ], + [ + -89.85169006347, + 47.73563274593 + ], + [ + -87.40782934019, + 48.46899192132 + ], + [ + -85.42842238879, + 47.71182754912 + ], + [ + -84.59131636529, + 46.15794585975 + ], + [ + -82.30957580566, + 45.52559633622 + ], + [ + -81.46362854003, + 44.69209194679 + ], + [ + -81.88110900878, + 44.20977652443 + ], + [ + -81.8510955766, + 43.41712830707 + ], + [ + -82.47238520342, + 43.10756679751 + ], + [ + -82.80401318863, + 42.46685608612 + ], + [ + -83.18305333795, + 42.36142339729 + ], + [ + -83.30731126331, + 41.96391883995 + ] + ] + ] + } +} From 5555ccfa0fbbc755399f7480d01a24eab21e2c53 Mon Sep 17 00:00:00 2001 From: Galen CC Date: Wed, 16 Apr 2025 20:04:40 -0400 Subject: [PATCH 4/4] CA: Ontario Mosaic: standardise WMS URLs Signed-off-by: Galen CC --- .../north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson | 2 +- ...c_2018-2022.geojson => Ontario_Mosaic_2018-2022_RGB.geojson} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sources/north-america/ca/on/{Ontario_Mosaic_2018-2022.geojson => Ontario_Mosaic_2018-2022_RGB.geojson} (91%) diff --git a/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson index 9bcabf910..874bc35a7 100644 --- a/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson +++ b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_CIR.geojson @@ -8,7 +8,7 @@ "required": true }, "name": "Ontario Orthophotography Mosaic 2018-2022 (CIR)", - "url": "https://ws.geoservices.lrc.gov.on.ca:443/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer/?FORMAT=image/jpeg&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&LAYERS=GEO_Imagery_Data_Service_2018to2022:NaturalResource_FalseColourComposite&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}", + "url": "https://ws.geoservices.lrc.gov.on.ca/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer/?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&LAYERS=GEO_Imagery_Data_Service_2018to2022:NaturalResource_FalseColourComposite&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}", "max_zoom": 20, "license_url": "https://osmfoundation.org/wiki/OGL_Canada_and_local_variants", "permission_osm": "implicit", diff --git a/sources/north-america/ca/on/Ontario_Mosaic_2018-2022.geojson b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_RGB.geojson similarity index 91% rename from sources/north-america/ca/on/Ontario_Mosaic_2018-2022.geojson rename to sources/north-america/ca/on/Ontario_Mosaic_2018-2022_RGB.geojson index 19d9ff337..ae96f66a1 100644 --- a/sources/north-america/ca/on/Ontario_Mosaic_2018-2022.geojson +++ b/sources/north-america/ca/on/Ontario_Mosaic_2018-2022_RGB.geojson @@ -8,7 +8,7 @@ "required": true }, "name": "Ontario Orthophotography Mosaic 2018-2022 (RGB)", - "url": "https://ws.geoservices.lrc.gov.on.ca:443/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer/?FORMAT=image/jpeg&TRANSPARENT=TRUE&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&LAYERS=GEO_Imagery_Data_Service_2018to2022:None&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}", + "url": "https://ws.geoservices.lrc.gov.on.ca/arcgis5/services/AerialImagery/GEO_Imagery_Data_Service_2018to2022/ImageServer/WMSServer/?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&LAYERS=GEO_Imagery_Data_Service_2018to2022:None&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}", "max_zoom": 20, "license_url": "https://osmfoundation.org/wiki/OGL_Canada_and_local_variants", "permission_osm": "implicit",