Release 1.1.9

mcguffin · Feb 1, 2020 · 3053fe5 · 3053fe5
1 parent e7e7101
commit 3053fe5
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 53 deletions.
diff --git a/assets/css/acf-input-osm.css b/assets/css/acf-input-osm.css
@@ -22,35 +22,33 @@
   cursor: pointer; }
 
 .leaflet-control-locate.active a {
-  color: #2074B6; }
+  color: #2074b6; }
 
 .leaflet-control-locate.active.following a {
-  color: #FC8428; }
+  color: #fc8428; }
 
 .leaflet-control-locate-location circle {
   -webkit-animation: leaflet-control-locate-throb 4s ease infinite;
           animation: leaflet-control-locate-throb 4s ease infinite; }
 
 @-webkit-keyframes leaflet-control-locate-throb {
   0% {
-    r: 9;
     stroke-width: 1; }
   50% {
-    r: 7;
-    stroke-width: 3; }
+    stroke-width: 3;
+    -webkit-transform: scale(0.8, 0.8);
+            transform: scale(0.8, 0.8); }
   100% {
-    r: 9;
     stroke-width: 1; } }
 
 @keyframes leaflet-control-locate-throb {
   0% {
-    r: 9;
     stroke-width: 1; }
   50% {
-    r: 7;
-    stroke-width: 3; }
+    stroke-width: 3;
+    -webkit-transform: scale(0.8, 0.8);
+            transform: scale(0.8, 0.8); }
   100% {
-    r: 9;
     stroke-width: 1; } }
 
 [data-map="leaflet"] {

diff --git a/assets/css/acf-input-osm.min.css b/assets/css/acf-input-osm.min.css
diff --git a/assets/js/acf-input-osm.min.js b/assets/js/acf-input-osm.min.js
diff --git a/assets/js/acf-osm-frontend.js b/assets/js/acf-osm-frontend.js
diff --git a/assets/js/acf-osm-frontend.min.js b/assets/js/acf-osm-frontend.min.js
diff --git a/etc/leaflet-providers.json b/etc/leaflet-providers.json
@@ -133,6 +133,13 @@
 			"Neighbourhood": "neighbourhood"
 		}
 	},
+	"CyclOSM": {
+		"url": "https://dev.{s}.tile.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png",
+		"options": {
+			"maxZoom": 20,
+			"attribution": "<a href=\"https://github.com/cyclosm/cyclosm-cartocss-style/releases\" title=\"CyclOSM - Open Bicycle render\">CyclOSM</a> | Map data: {attribution.OpenStreetMap}"
+		}
+	},
 	"OpenMapSurfer": {
 		"url": "https://maps.heigit.org/openmapsurfer/tiles/{variant}/webmercator/{z}/{x}/{y}.png",
 		"options": {
@@ -292,7 +299,7 @@
 		"options": {
 			"variant": "basic",
 			"maxZoom": 22,
-			"attribution": "<a href=\"https://tomtom.com\" target=\"_blank\">&copy;  1992 - 2019 TomTom.</a> ",
+			"attribution": "<a href=\"https://tomtom.com\" target=\"_blank\">&copy;  1992 - 2020 TomTom.</a> ",
 			"subdomains": "abcd",
 			"style": "main",
 			"ext": "png",
@@ -405,7 +412,7 @@
 	"HERE": {
 		"url": "https://{s}.{base}.maps.api.here.com/maptile/2.1/{type}/{mapID}/{variant}/{z}/{x}/{y}/{size}/{format}?app_id={app_id}&app_code={app_code}&lg={language}",
 		"options": {
-			"attribution": "Map &copy; 1987-2019 <a href=\"http://developer.here.com\">HERE</a>",
+			"attribution": "Map &copy; 1987-2020 <a href=\"http://developer.here.com\">HERE</a>",
 			"subdomains": "1234",
 			"mapID": "newest",
 			"app_id": "<insert your app_id here>",
@@ -576,7 +583,7 @@
 		}
 	},
 	"BasemapAT": {
-		"url": "https://maps{s}.wien.gv.at/basemap/{variant}/normal/google3857/{z}/{y}/{x}.{format}",
+		"url": "https://maps{s}.wien.gv.at/basemap/{variant}/{type}/google3857/{z}/{y}/{x}.{format}",
 		"options": {
 			"maxZoom": 19,
 			"attribution": "Datenquelle: <a href=\"https://www.basemap.at\">basemap.at</a>",
@@ -587,6 +594,7 @@
 				"3",
 				"4"
 			],
+			"type": "normal",
 			"format": "png",
 			"bounds": [
 				[
@@ -609,6 +617,20 @@
 			},
 			"grau": "bmapgrau",
 			"overlay": "bmapoverlay",
+			"terrain": {
+				"options": {
+					"variant": "bmapgelaende",
+					"type": "grau",
+					"format": "jpeg"
+				}
+			},
+			"surface": {
+				"options": {
+					"variant": "bmapoberflaeche",
+					"type": "grau",
+					"format": "jpeg"
+				}
+			},
 			"highdpi": {
 				"options": {
 					"variant": "bmaphidpi",
@@ -646,7 +668,7 @@
 			"pastel": "brtachtergrondkaartpastel",
 			"grijs": "brtachtergrondkaartgrijs",
 			"luchtfoto": {
-				"url": "https://geodata.nationaalgeoregister.nl/luchtfoto/rgb/wmts/1.0.0/2016_ortho25/EPSG:3857/{z}/{x}/{y}.png"
+				"url": "https://geodata.nationaalgeoregister.nl/luchtfoto/rgb/wmts/2018_ortho25/EPSG:3857/{z}/{x}/{y}.png"
 			}
 		}
 	},

diff --git a/include/version.php b/include/version.php
@@ -1 +1 @@
-<?php return "1.1.8";
+<?php return "1.1.9";
diff --git a/index.php b/index.php
@@ -5,7 +5,7 @@
 Plugin URI: https://wordpress.org/plugins/acf-openstreetmap-field
 Description: A configurable OpenStreetMap Field for ACF.
 Author: Jörn Lund
-Version: 1.1.8
+Version: 1.1.9
 Author URI: https://github.com/mcguffin
 License: GPL3
 Text Domain: acf-openstreetmap-field

diff --git a/languages/acf-openstreetmap-field.pot b/languages/acf-openstreetmap-field.pot
@@ -1,15 +1,15 @@
-# Copyright (C) 2019 Jörn Lund
+# Copyright (C) 2020 Jörn Lund
 # This file is distributed under the same license as the ACF OpenStreetMap Field plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: ACF OpenStreetMap Field 1.1.8\n"
-"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/acf-openstreetmap-field-master\n"
+"Project-Id-Version: ACF OpenStreetMap Field 1.1.9\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/acf-openstreetmap-field\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2019-12-21T15:27:21+00:00\n"
+"POT-Creation-Date: 2020-02-01T08:14:55+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.4.0\n"
 "X-Domain: acf-openstreetmap-field\n"
@@ -66,7 +66,7 @@ msgid "{state} {country}"
 msgstr ""
 
 #: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:51
-#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:37
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:61
 msgid "OpenStreetMap"
 msgstr ""
 
@@ -147,42 +147,52 @@ msgstr ""
 msgid "Tap and hold to add Marker."
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:321
+#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:322
 msgid "Drag Marker to move."
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:659
+#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:661
 msgid "View Larger Map"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:737
+#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:739
 msgid "Please set a marker on the map."
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:825
+#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:829
 msgid "Locate Marker"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:831
+#: include/ACFFieldOpenstreetmap/Field/OpenStreetMap.php:837
 msgid "Remove Marker"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:37
+#. translators: %s: Plugin name.
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:48
+msgctxt "plugin"
+msgid "%s Settings"
+msgstr ""
+
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:49
+msgid "Settings"
+msgstr ""
+
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:61
 msgid "OpenStreetMap Settings"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:51
-msgid "acf-openstreetmap-field Settings"
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:75
+msgid "ACF OpenStreetMap Settings"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:57
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:81
 msgid "Save Settings"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:86
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:110
 msgid "Access Tokens"
 msgstr ""
 
-#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:139
+#: include/ACFFieldOpenstreetmap/Settings/SettingsOpenStreetMap.php:163
 msgid "Enter Access Tokens for various Map Tile providers."
 msgstr ""
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acf-openstreetmap-field",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "A configurable OpenStreetMap Field to ACF.",
   "private": true,
   "scripts": {
@@ -39,9 +39,9 @@
     "gulp-uglify": "^3.0.2",
     "gulp-uglifycss": "^1.1.0",
     "leaflet": "^1.6.0",
-    "leaflet-control-geocoder": "^1.10.0",
+    "leaflet-control-geocoder": "^1.11.0",
     "leaflet-providers": "^1.9.0",
-    "leaflet.locatecontrol": "^0.68.0",
+    "leaflet.locatecontrol": "^0.70.0",
     "resize-observer-polyfill": "^1.5.1",
     "simple-git": "^1.126.0"
   },
@@ -58,6 +58,7 @@
     ],
     "type": "plugin",
     "build": {
+      "versionedFiles": null,
       "prebuild": [
         "wp i18n make-pot . languages/acf-openstreetmap-field.pot --domain=acf-openstreetmap-field --exclude=tmp"
       ],
@@ -75,4 +76,4 @@
       "svn": "https://plugins.svn.wordpress.org/acf-openstreetmap-field/"
     }
   }
-}
+}
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: map acf openstreetmap leaflet
 Requires at least: 4.8
 Requires PHP: 5.6
 Tested up to: 5.3
-Stable tag: 1.1.8
+Stable tag: 1.1.9
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -108,7 +108,9 @@ No.
 == Changelog ==
 
 = 1.1.9 =
- - Add Settings link on plugins list table
+ - UI: Add Settings link on plugins list table
+ - Fix: hide map provider with unconfigured api key from layer selection
+ - Upgrade: leaflet-control-geocoder, leaflet.locatecontrol, leaflet-providers
  - Security hardening
 
 = 1.1.8 =