diff --git a/layers/josm/Freemap.sk-Car.geojson b/layers/josm/Freemap.sk-Car.geojson index a4534f4..5636f44 100644 --- a/layers/josm/Freemap.sk-Car.geojson +++ b/layers/josm/Freemap.sk-Car.geojson @@ -3,188 +3,24 @@ "coordinates": [ [ [ - 19.83682, - 49.25529 + 16.69, + 47.64 ], [ - 19.80075, - 49.42385 + 22.67, + 47.64 ], [ - 19.60437, - 49.48058 + 22.67, + 49.65 ], [ - 19.49179, - 49.63961 + 16.69, + 49.65 ], [ - 19.21831, - 49.52604 - ], - [ - 19.16778, - 49.42521 - ], - [ - 19.00308, - 49.42236 - ], - [ - 18.97611, - 49.5308 - ], - [ - 18.54685, - 49.51425 - ], - [ - 18.31432, - 49.33818 - ], - [ - 18.15913, - 49.2961 - ], - [ - 18.05564, - 49.11134 - ], - [ - 17.56396, - 48.84938 - ], - [ - 17.17929, - 48.88816 - ], - [ - 17.058, - 48.81105 - ], - [ - 16.90426, - 48.61947 - ], - [ - 16.79685, - 48.38561 - ], - [ - 17.06762, - 48.01116 - ], - [ - 17.32787, - 47.97749 - ], - [ - 17.51699, - 47.82535 - ], - [ - 17.74776, - 47.73093 - ], - [ - 18.29515, - 47.72075 - ], - [ - 18.67959, - 47.75541 - ], - [ - 18.89755, - 47.81203 - ], - [ - 18.79463, - 47.88245 - ], - [ - 18.84318, - 48.04046 - ], - [ - 19.46212, - 48.05333 - ], - [ - 19.62064, - 48.22938 - ], - [ - 19.89585, - 48.09387 - ], - [ - 20.33766, - 48.2643 - ], - [ - 20.55395, - 48.52358 - ], - [ - 20.82335, - 48.55714 - ], - [ - 21.10271, - 48.47096 - ], - [ - 21.45863, - 48.55513 - ], - [ - 21.74536, - 48.31435 - ], - [ - 22.15293, - 48.37179 - ], - [ - 22.61255, - 49.08914 - ], - [ - 22.09997, - 49.23814 - ], - [ - 21.9686, - 49.36363 - ], - [ - 21.6244, - 49.46989 - ], - [ - 21.06873, - 49.46402 - ], - [ - 20.94336, - 49.31088 - ], - [ - 20.73052, - 49.44006 - ], - [ - 20.22804, - 49.41714 - ], - [ - 20.05234, - 49.23052 - ], - [ - 19.83682, - 49.25529 + 16.69, + 47.64 ] ] ], @@ -193,7 +29,8 @@ "properties": { "attribution": { "required": true, - "text": "Copyright ©2007-2012 Freemap Slovakia (www.freemap.sk). Some rights reserved." + "text": "Map © Freemap Slovakia, data © OpenStreetMap contributors", + "url": "https://www.freemap.sk/?layers=A" }, "category": "osmbasedmap", "country_code": "SK", diff --git a/layers/josm/Freemap.sk-Cyclo.geojson b/layers/josm/Freemap.sk-Cyclo.geojson index ed80a3d..985acfc 100644 --- a/layers/josm/Freemap.sk-Cyclo.geojson +++ b/layers/josm/Freemap.sk-Cyclo.geojson @@ -3,188 +3,24 @@ "coordinates": [ [ [ - 19.83682, - 49.25529 + 16.69, + 47.64 ], [ - 19.80075, - 49.42385 + 22.67, + 47.64 ], [ - 19.60437, - 49.48058 + 22.67, + 49.65 ], [ - 19.49179, - 49.63961 + 16.69, + 49.65 ], [ - 19.21831, - 49.52604 - ], - [ - 19.16778, - 49.42521 - ], - [ - 19.00308, - 49.42236 - ], - [ - 18.97611, - 49.5308 - ], - [ - 18.54685, - 49.51425 - ], - [ - 18.31432, - 49.33818 - ], - [ - 18.15913, - 49.2961 - ], - [ - 18.05564, - 49.11134 - ], - [ - 17.56396, - 48.84938 - ], - [ - 17.17929, - 48.88816 - ], - [ - 17.058, - 48.81105 - ], - [ - 16.90426, - 48.61947 - ], - [ - 16.79685, - 48.38561 - ], - [ - 17.06762, - 48.01116 - ], - [ - 17.32787, - 47.97749 - ], - [ - 17.51699, - 47.82535 - ], - [ - 17.74776, - 47.73093 - ], - [ - 18.29515, - 47.72075 - ], - [ - 18.67959, - 47.75541 - ], - [ - 18.89755, - 47.81203 - ], - [ - 18.79463, - 47.88245 - ], - [ - 18.84318, - 48.04046 - ], - [ - 19.46212, - 48.05333 - ], - [ - 19.62064, - 48.22938 - ], - [ - 19.89585, - 48.09387 - ], - [ - 20.33766, - 48.2643 - ], - [ - 20.55395, - 48.52358 - ], - [ - 20.82335, - 48.55714 - ], - [ - 21.10271, - 48.47096 - ], - [ - 21.45863, - 48.55513 - ], - [ - 21.74536, - 48.31435 - ], - [ - 22.15293, - 48.37179 - ], - [ - 22.61255, - 49.08914 - ], - [ - 22.09997, - 49.23814 - ], - [ - 21.9686, - 49.36363 - ], - [ - 21.6244, - 49.46989 - ], - [ - 21.06873, - 49.46402 - ], - [ - 20.94336, - 49.31088 - ], - [ - 20.73052, - 49.44006 - ], - [ - 20.22804, - 49.41714 - ], - [ - 20.05234, - 49.23052 - ], - [ - 19.83682, - 49.25529 + 16.69, + 47.64 ] ] ], @@ -193,7 +29,8 @@ "properties": { "attribution": { "required": true, - "text": "Copyright ©2007-2012 Freemap Slovakia (www.freemap.sk). Some rights reserved." + "text": "Map © Freemap Slovakia, data © OpenStreetMap contributors and SRTM", + "url": "https://www.freemap.sk/?layers=C" }, "category": "osmbasedmap", "country_code": "SK", @@ -201,7 +38,7 @@ "id": "Freemap.sk-Cyclo", "max_zoom": 16, "min_zoom": 8, - "name": "Freemap.sk Cyclo", + "name": "Freemap.sk Bicycle", "type": "tms", "url": "https://tile.freemap.sk/C/{zoom}/{x}/{y}.jpeg", "dataSource": "JOSM" diff --git a/layers/josm/Freemap.sk-Hiking.geojson b/layers/josm/Freemap.sk-Hiking.geojson index 6f2f86f..6c0f473 100644 --- a/layers/josm/Freemap.sk-Hiking.geojson +++ b/layers/josm/Freemap.sk-Hiking.geojson @@ -3,188 +3,24 @@ "coordinates": [ [ [ - 19.83682, - 49.25529 + 16.69, + 47.64 ], [ - 19.80075, - 49.42385 + 22.67, + 47.64 ], [ - 19.60437, - 49.48058 + 22.67, + 49.65 ], [ - 19.49179, - 49.63961 + 16.69, + 49.65 ], [ - 19.21831, - 49.52604 - ], - [ - 19.16778, - 49.42521 - ], - [ - 19.00308, - 49.42236 - ], - [ - 18.97611, - 49.5308 - ], - [ - 18.54685, - 49.51425 - ], - [ - 18.31432, - 49.33818 - ], - [ - 18.15913, - 49.2961 - ], - [ - 18.05564, - 49.11134 - ], - [ - 17.56396, - 48.84938 - ], - [ - 17.17929, - 48.88816 - ], - [ - 17.058, - 48.81105 - ], - [ - 16.90426, - 48.61947 - ], - [ - 16.79685, - 48.38561 - ], - [ - 17.06762, - 48.01116 - ], - [ - 17.32787, - 47.97749 - ], - [ - 17.51699, - 47.82535 - ], - [ - 17.74776, - 47.73093 - ], - [ - 18.29515, - 47.72075 - ], - [ - 18.67959, - 47.75541 - ], - [ - 18.89755, - 47.81203 - ], - [ - 18.79463, - 47.88245 - ], - [ - 18.84318, - 48.04046 - ], - [ - 19.46212, - 48.05333 - ], - [ - 19.62064, - 48.22938 - ], - [ - 19.89585, - 48.09387 - ], - [ - 20.33766, - 48.2643 - ], - [ - 20.55395, - 48.52358 - ], - [ - 20.82335, - 48.55714 - ], - [ - 21.10271, - 48.47096 - ], - [ - 21.45863, - 48.55513 - ], - [ - 21.74536, - 48.31435 - ], - [ - 22.15293, - 48.37179 - ], - [ - 22.61255, - 49.08914 - ], - [ - 22.09997, - 49.23814 - ], - [ - 21.9686, - 49.36363 - ], - [ - 21.6244, - 49.46989 - ], - [ - 21.06873, - 49.46402 - ], - [ - 20.94336, - 49.31088 - ], - [ - 20.73052, - 49.44006 - ], - [ - 20.22804, - 49.41714 - ], - [ - 20.05234, - 49.23052 - ], - [ - 19.83682, - 49.25529 + 16.69, + 47.64 ] ] ], @@ -192,9 +28,9 @@ }, "properties": { "attribution": { - "logo-image": "https://raw.githubusercontent.com/FreemapSlovakia/freemap-v3-react/master/src/images/freemap-logo-small.png", "required": true, - "text": "Copyright ©2007-2012 Freemap Slovakia (www.freemap.sk). Some rights reserved." + "text": "Map © Freemap Slovakia, data © OpenStreetMap contributors and SRTM", + "url": "https://www.freemap.sk/?layers=T" }, "category": "osmbasedmap", "country_code": "SK", diff --git a/layers/josm/Freemap.sk-Outdoor.geojson b/layers/josm/Freemap.sk-Outdoor.geojson index 0ceb977..272cb94 100644 --- a/layers/josm/Freemap.sk-Outdoor.geojson +++ b/layers/josm/Freemap.sk-Outdoor.geojson @@ -35,32 +35,40 @@ 47.58764167942 ], [ - 5.59753417969, - 46.29761098988 + 5.5959892273, + 46.29749238675 ], [ - 6.860962, - 44.203866 + 5.0039263916, + 45.2122799013 ], [ - 7.558594, - 43.564472 + 5.00517393317, + 43.33975593618 ], [ - 9.239502, - 43.564472 + 7.72338871875, + 38.4277739576 ], [ - 10.184326, - 42.195969 + 11.29668914795, + 37.26312626931 ], [ - 13.64501953125, - 40.40513069753 + 11.56859802246, + 36.46547630448 ], [ - 21.10473632813, - 40.63896734382 + 15.20506713867, + 36.48314944975 + ], + [ + 20.17639160156, + 39.31092541213 + ], + [ + 21.31896972657, + 40.69729900864 ], [ 23.642578125, @@ -93,14 +101,15 @@ "properties": { "attribution": { "required": true, - "text": "Copyright ©2019 Freemap Slovakia (www.freemap.sk). Some rights reserved." + "text": "Map © Freemap Slovakia, data © OpenStreetMap contributors and SRTM", + "url": "https://www.freemap.sk/?layers=X" }, "category": "osmbasedmap", "country_code": "SK", "icon": "https://raw.githubusercontent.com/FreemapSlovakia/freemap-v3-react/master/src/images/freemap-logo-small.png", "id": "Freemap.sk-Outdoor", "max_zoom": 19, - "min_zoom": 7, + "min_zoom": 6, "name": "Freemap.sk Outdoor", "type": "tms", "url": "https://outdoor.tiles.freemap.sk/{zoom}/{x}/{y}", diff --git a/layers/josm/Israel_Hiking.geojson b/layers/josm/Israel_Hiking.geojson index 4c96955..086ebe6 100644 --- a/layers/josm/Israel_Hiking.geojson +++ b/layers/josm/Israel_Hiking.geojson @@ -180,6 +180,7 @@ "max_zoom": 16, "min_zoom": 7, "name": "Israel Hiking", + "privacy_policy_url": "https://github.com/IsraelHikingMap/Site/wiki/Privacy-Policy-and-Terms-of-Service", "type": "tms", "url": "https://israelhiking.osm.org.il/Tiles/{zoom}/{x}/{y}.png", "dataSource": "JOSM" diff --git a/layers/josm/Israel_MTB.geojson b/layers/josm/Israel_MTB.geojson index ff7dc04..f5ce0e6 100644 --- a/layers/josm/Israel_MTB.geojson +++ b/layers/josm/Israel_MTB.geojson @@ -180,6 +180,7 @@ "max_zoom": 16, "min_zoom": 7, "name": "Israel MTB", + "privacy_policy_url": "https://github.com/IsraelHikingMap/Site/wiki/Privacy-Policy-and-Terms-of-Service", "type": "tms", "url": "https://israelhiking.osm.org.il/MTBTiles/{zoom}/{x}/{y}.png", "dataSource": "JOSM" diff --git a/layers/josm/Waymarked_Trails-Cycling.geojson b/layers/josm/Waymarked_Trails-Cycling.geojson index c80405b..1b7ee2b 100644 --- a/layers/josm/Waymarked_Trails-Cycling.geojson +++ b/layers/josm/Waymarked_Trails-Cycling.geojson @@ -6,7 +6,7 @@ "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0", "url": "https://cycling.waymarkedtrails.org/help/legal" }, - "category": "other", + "category": "osmbasedmap", "icon": "https://static.waymarkedtrails.org/img/map_cycling.png", "id": "Waymarked_Trails-Cycling", "max_zoom": 18, diff --git a/layers/josm/Waymarked_Trails-Hiking.geojson b/layers/josm/Waymarked_Trails-Hiking.geojson index f24be94..1e28fb0 100644 --- a/layers/josm/Waymarked_Trails-Hiking.geojson +++ b/layers/josm/Waymarked_Trails-Hiking.geojson @@ -6,7 +6,7 @@ "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0", "url": "https://hiking.waymarkedtrails.org/help/legal" }, - "category": "other", + "category": "osmbasedmap", "icon": "https://static.waymarkedtrails.org/img/map_hiking.png", "id": "Waymarked_Trails-Hiking", "max_zoom": 18, diff --git a/layers/josm/Waymarked_Trails-MTB.geojson b/layers/josm/Waymarked_Trails-MTB.geojson index 6a37028..32535ed 100644 --- a/layers/josm/Waymarked_Trails-MTB.geojson +++ b/layers/josm/Waymarked_Trails-MTB.geojson @@ -6,7 +6,7 @@ "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0", "url": "https://mtb.waymarkedtrails.org/help/legal" }, - "category": "other", + "category": "osmbasedmap", "icon": "https://static.waymarkedtrails.org/img/map_mtb.png", "id": "Waymarked_Trails-MTB", "max_zoom": 18, diff --git a/layers/josm/opencylemap.geojson b/layers/josm/opencylemap.geojson index ab08830..1f352a0 100644 --- a/layers/josm/opencylemap.geojson +++ b/layers/josm/opencylemap.geojson @@ -15,7 +15,7 @@ "name": "OpenCycleMap", "privacy_policy_url": "https://www.thunderforest.com/privacy", "type": "tms", - "url": "https://{switch:a,b,c}.tile.thunderforest.com/cycle/{zoom}/{x}/{y}.png?apikey=7bd5ed2197cf4da29fa26de0ba6530cc", + "url": "https://{switch:a,b,c}.tile.thunderforest.com/cycle/{zoom}/{x}/{y}.png?apikey={apikey}", "valid-georeference": true, "dataSource": "JOSM" }, diff --git a/layers/josm/osm-cambodia_laos_thailand_vietnam-bilingual.geojson b/layers/josm/osm-cambodia_laos_thailand_vietnam-bilingual.geojson index 6782a5a..8370343 100644 --- a/layers/josm/osm-cambodia_laos_thailand_vietnam-bilingual.geojson +++ b/layers/josm/osm-cambodia_laos_thailand_vietnam-bilingual.geojson @@ -160,6 +160,7 @@ "id": "osm-cambodia_laos_thailand_vietnam-bilingual", "max_zoom": 20, "name": "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual", + "privacy_policy_url": "https://www.osm-tools.org", "type": "tms", "url": "https://{switch:a,b,c,d}.tile.osm-tools.org/osm/{zoom}/{x}/{y}.png", "valid-georeference": true, diff --git a/layers/josm/standard.geojson b/layers/josm/standard.geojson index 1a14675..8b6d02d 100644 --- a/layers/josm/standard.geojson +++ b/layers/josm/standard.geojson @@ -3,7 +3,7 @@ "properties": { "attribution": { "required": true, - "text": "© OpenStreetMap contributors, CC-BY-SA 2.0", + "text": "© OpenStreetMap contributors", "url": "https://www.openstreetmap.org/" }, "category": "osmbasedmap", @@ -16,7 +16,7 @@ "name": "OpenStreetMap Carto (Standard)", "privacy_policy_url": "https://wiki.osmfoundation.org/wiki/Privacy_Policy", "type": "tms", - "url": "https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png", + "url": "https://tile.openstreetmap.org/{zoom}/{x}/{y}.png", "valid-georeference": true, "dataSource": "JOSM" },