branch: externals/osm commit bdc56ee2ebeeeda1839e716e5ea1523fe7e88f4a Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Nicer copyright header --- osm.el | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/osm.el b/osm.el index 495502785c..0977e6b206 100644 --- a/osm.el +++ b/osm.el @@ -80,85 +80,85 @@ A comma-separated specifies descending order of preference. See also :url "https://%s.tile.openstreetmap.org/%z/%x/%y.png" :group "Standard" :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {OpenStreetMap Standard|https://www.openstreetmap.org/copyright}")) + "Map style © {OpenStreetMap Standard|https://www.openstreetmap.org/copyright}")) (de :name "Mapnik(de)" :description "Localized Mapnik map provided by OpenStreetMap Germany" :url "https://%s.tile.openstreetmap.de/%z/%x/%y.png" :group "Standard" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {OpenStreetMap Deutschland|https://www.openstreetmap.de/germanstyle.html}")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {OpenStreetMap Deutschland|https://www.openstreetmap.de/germanstyle.html}")) (fr :name "Mapnik(fr)" :description "Localized Mapnik map by OpenStreetMap France" :url "https://%s.tile.openstreetmap.fr/osmfr/%z/%x/%y.png" :group "Standard" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {OpenStreetMap France|https://www.openstreetmap.fr/mentions-legales/}")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {OpenStreetMap France|https://www.openstreetmap.fr/mentions-legales/}")) (humanitarian :name "Humanitarian" :description "Humanitarian map provided by OpenStreetMap France" :url "https://%s.tile.openstreetmap.fr/hot/%z/%x/%y.png" :group "Special Purpose" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {Humanitarian OpenStreetMap Team|https://www.hotosm.org/updates/2013-09-29_a_new_window_on_openstreetmap_data}")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {Humanitarian OpenStreetMap Team|https://www.hotosm.org/updates/2013-09-29_a_new_window_on_openstreetmap_data}")) (cyclosm :name "CyclOSM" :description "Bicycle-oriented map provided by OpenStreetMap France" :url "https://%s.tile.openstreetmap.fr/cyclosm/%z/%x/%y.png" :group "Transportation" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {CyclOSM|https://www.cyclosm.org/} contributors")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {CyclOSM|https://www.cyclosm.org/} contributors")) (openriverboatmap :name "OpenRiverBoatMap" :description "Waterways map provided by OpenStreetMap France" :url "https://%s.tile.openstreetmap.fr/openriverboatmap/%z/%x/%y.png" :group "Transportation" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {OpenRiverBoatMap|https://github.com/tilery/OpenRiverboatMap}")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {OpenRiverBoatMap|https://github.com/tilery/OpenRiverboatMap}")) (opentopomap :name "OpenTopoMap" :description "Topographical map provided by OpenTopoMap" :url "https://%s.tile.opentopomap.org/%z/%x/%y.png" :group "Topographical" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {OpenTopoMap|https://www.opentopomap.org} ({CC-BY-SA|https://creativecommons.org/licenses/by-sa/3.0/})" + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {OpenTopoMap|https://www.opentopomap.org} ({CC-BY-SA|https://creativecommons.org/licenses/by-sa/3.0/})" "Elevation data: {SRTM|https://www2.jpl.nasa.gov/srtm/}")) (opvn :name "ÖPNV" :max-zoom 18 :description "Base layer with public transport information" :url "http://%s.tile.memomaps.de/tilegen/%z/%x/%y.png" :group "Transportation" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {ÖPNVKarte|https://www.öpnvkarte.de}")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {ÖPNVKarte|https://www.öpnvkarte.de}")) (stamen-watercolor :name "Stamen Watercolor" :description "Artistic map in watercolor style provided by Stamen" :url "https://stamen-tiles-%s.a.ssl.fastly.net/watercolor/%z/%x/%y.jpg" :group "Artistic" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})")) (stamen-terrain :name "Stamen Terrain" :max-zoom 18 :description "Map with hill shading provided by Stamen" :url "https://stamen-tiles-%s.a.ssl.fastly.net/terrain/%z/%x/%y.png" :group "Artistic" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})")) (stamen-toner-dark :name "Stamen Toner Dark" :description "Artistic map in toner style provided by Stamen" :url "https://stamen-tiles-%s.a.ssl.fastly.net/toner/%z/%x/%y.png" :group "Artistic" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})")) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})")) (stamen-toner-light :name "Stamen Toner Lite" :description "Artistic map in toner style provided by Stamen" :url "https://stamen-tiles-%s.a.ssl.fastly.net/toner-lite/%z/%x/%y.png" :group "Artistic" - :copyright ("Map data: © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" - "Map style: © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})"))) + :copyright ("Map data © {OpenStreetMap|https://www.openstreetmap.org/copyright} contributors" + "Map style © {Stamen Design|http://maps.stamen.com/} ({CC-BY|https://creativecommons.org/licenses/by/3.0/})"))) "List of tile servers." :type '(alist :key-type symbol :value-type plist)) @@ -1138,12 +1138,11 @@ xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'> (if (listp copyright) (string-join copyright " | ") copyright) - (propertize " " - 'display - '(space :align-to right))))) + (propertize " " 'display '(space :align-to right)) + " "))) (add-face-text-property 0 (length copyright) - '(:inherit (header-line variable-pitch) :height 0.75) + '(:inherit (header-line variable-pitch) :height 0.65) t copyright) (setq-local tab-line-format (list 'osm-copyright copyright)))))