Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare release 4.1.2 #133

Merged
merged 3 commits into from
Jun 2, 2023
Merged

Prepare release 4.1.2 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
653cd13
Unified string OpenStreetMap
albig Jun 1, 2023
bfa2f17
Update tile layers
albig Jun 1, 2023
7e29850
Fix some detais in documenation
albig Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Controller/PluginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
use TYPO3\CMS\Core\Resource\FileRepository;

/**
* Plugin 'Openstreetmap' for the 'ods_osm' extension.
* Plugin 'OpenStreetMap' for the 'ods_osm' extension.
*
* @author Robert Heel <typo3@bobosch.de>
* @package TYPO3
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Editors/Index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Users manual

Frontend Plugin
---------------
Insert the Openstreetmap as frontend plugin and define at least one marker to show.
Insert the OpenStreetMap as frontend plugin and define at least one marker to show.
The map will center to the average coordinates of the markers.

.. image:: ../Images/FrontendPlugin.png
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ EXT: ods_osm (OpenStreetMap)
:Rendered: |today|
:Description:
Add an interactive OpenStreetMap map to your website.
Can also show other OpenLayers compatible maps.
Can also show other tile based maps with OpenLayers or Leaflet.

.. toctree::
:maxdepth: 2
Expand Down
8 changes: 7 additions & 1 deletion Documentation/Introduction/Index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ What does it do?
- Show an interactive OpenStreetMap map with OpenLayers or Leaflet.
- Store coordinates in fe_users and tt_address tables and show as markers in the map.
- Show record information in popup window.
- Display gps tracks.
- Display gps tracks (GPX, KML).

Screenshots
-----------
Expand All @@ -20,8 +20,14 @@ The example shows the output of the frontend plugin with the following settings:

.. image:: ../Images/FrontendExample.png

Demo Instance
-------------

At https://osm.bigga.de a demo instance of EXT:ods_osm is available which presents multiple use cases of this extension.

Donation
--------

This extension was only possible with the help of many other free projects.

You're likely using one of the main map “Mapnik”, “Osmarender” or “Cyclemap” - feel free to donate to the OpenStreetMap project http://donate.openstreetmap.org/
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Tutorial/Index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Create Record
Place OSM Plugin
----------------

1. Insert a content element plugin “Openstreetmap” on your page.
1. Insert a content element plugin "OpenStreetMap" on your page.
2. Add your address record in "Records to show”.

.. figure:: /Images/RecordsToShow.png
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Language/de.locallang.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<header/>
<body>
<trans-unit id="pi1_title" xml:space="preserve" approved="yes">
<source>Openstreetmap</source>
<target>Openstreetmap</target>
<source>OpenStreetMap</source>
<target>OpenStreetMap</target>
</trans-unit>
<trans-unit id="pi1_plus_wiz_description" xml:space="preserve" approved="yes">
<source>Add an interactive map to your website.</source>
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Language/de.locallang_db.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<target><![CDATA[Marker]]></target>
</trans-unit>
<trans-unit id="tt_content.list_type_pi1" approved="yes">
<source><![CDATA[Openstreetmap]]></source>
<target><![CDATA[Openstreetmap]]></target>
<source><![CDATA[OpenStreetMap]]></source>
<target><![CDATA[OpenStreetMap]]></target>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.cluster" approved="yes">
<source><![CDATA[Cluster markers]]></source>
Expand Down
6 changes: 3 additions & 3 deletions Resources/Private/Language/it.locallang.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<header/>
<body>
<trans-unit id="pi1_title" xml:space="preserve" approved="yes">
<source>Openstreetmap</source>
<target>Openstreetmap</target>
<source>OpenStreetMap</source>
<target>OpenStreetMap</target>
</trans-unit>
<trans-unit id="pi1_plus_wiz_description" xml:space="preserve" approved="yes">
<source>Add an interactive map to your website.</source>
Expand All @@ -17,4 +17,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
4 changes: 2 additions & 2 deletions Resources/Private/Language/it.locallang_db.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<target>Segnaposto</target>
</trans-unit>
<trans-unit id="tt_content.list_type_pi1" xml:space="preserve" approved="yes">
<source>Openstreetmap</source>
<target>Openstreetmap</target>
<source>OpenStreetMap</source>
<target>OpenStreetMap</target>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.sheet_sDEF" xml:space="preserve" approved="yes">
<source>Default</source>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Language/locallang.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<header/>
<body>
<trans-unit id="pi1_title" xml:space="preserve">
<source>Openstreetmap</source>
<source>OpenStreetMap</source>
</trans-unit>
<trans-unit id="pi1_plus_wiz_description" xml:space="preserve">
<source>Add an interactive map to your website.</source>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Language/locallang_db.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<source>Marker</source>
</trans-unit>
<trans-unit id="tt_content.list_type_pi1" xml:space="preserve">
<source>Openstreetmap</source>
<source>OpenStreetMap</source>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.sheet_sDEF" xml:space="preserve">
<source>Default</source>
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
'suggests' => [],
],
'state' => 'stable',
'version' => '4.1.1',
'version' => '4.1.2',
];
5 changes: 3 additions & 2 deletions ext_tables_static+adt.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CREATE TABLE tx_odsosm_layer (


INSERT INTO `tx_odsosm_layer` VALUES (1,0,0,0,0,512,0,0,'Mapnik',0,'','','https://staticmap.abigga.de/?center=###lat###,###lon###&zoom=###zoom###&size=###width###x###height###&maptype=mapnik','{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',1,0,19,'','© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>','https://www.openstreetmap.org/');
INSERT INTO `tx_odsosm_layer` VALUES (2,0,0,0,0,768,0,0,'SLUB Renderer',0,'','','https://staticmap.abigga.de/?center=###lat###,###lon###&zoom=###zoom###&size=###width###x###height###&maptype=slub','tile-{s}.kartenforum.slub-dresden.de/styles/maptiler-basic-v2/{z}/{x}/{y}.png',1,0,19,'1234','© SLUB <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>','https://kartenforum.slub-dresden.de/');
INSERT INTO `tx_odsosm_layer` VALUES (2,0,0,0,0,768,0,0,'SLUB Renderer',0,'','','https://staticmap.abigga.de/?center=###lat###,###lon###&zoom=###zoom###&size=###width###x###height###&maptype=slub','tile-{s}.kartenforum.slub-dresden.de/styles/maptiler-basic-v2/{z}/{x}/{y}.png',1,0,19,'1234','© <a href="https://kartenforum.slub-dresden.de/">SLUB</a> <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>','https://kartenforum.slub-dresden.de/');
INSERT INTO `tx_odsosm_layer` VALUES (3,0,0,0,0,1024,0,0,'CycleMap',0,'','','https://staticmap.abigga.de/?center=###lat###,###lon###&zoom=###zoom###&size=###width###x###height###&maptype=cycle','{s}.tile.hosted.thunderforest.com/cycle/{z}/{x}/{y}.png',1,0,19,'','© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>','https://www.opencyclemap.org/');
INSERT INTO `tx_odsosm_layer` VALUES (4,0,0,0,0,1792,0,0,'Seamarks',1,'','','','tiles.openseamap.org/seamark/{z}/{x}/{y}.png',1,0,0,'','','http://www.openseamap.org/');
INSERT INTO `tx_odsosm_layer` VALUES (5,0,0,0,0,1280,0,1,'OpenPisteMap',1,'','','','tiles.openpistemap.org/nocontours/{z}/{x}/{y}.png',0,0,0,'','','http://openpistemap.org/');
Expand All @@ -49,7 +49,7 @@ INSERT INTO `tx_odsosm_layer` VALUES (11,0,0,0,0,3328,0,1,'Bing Aerial',0,'','ne
INSERT INTO `tx_odsosm_layer` VALUES (12,0,0,0,0,3584,0,1,'Bing Hybrid',0,'','new OpenLayers.Layer.Bing({name:\'###TITLE###\',key:\'###STATIC_SCRIPT###\',type:\'AerialWithLabels\'})','','',0,0,0,'','','http://www.bing.com/maps/');
INSERT INTO `tx_odsosm_layer` VALUES (13,0,0,0,0,1536,0,0,'ÖPNV Deutschland',0,'','','','tile.memomaps.de/tilegen/{z}/{x}/{y}.png',1,0,19,'','','http://www.öpnvkarte.de/');
INSERT INTO `tx_odsosm_layer` VALUES (14,0,0,0,0,1152,0,0,'Hike & Bike Map',0,'','','','{s}.tiles.wmflabs.org/hikebike/{z}/{x}/{y}.png',1,0,0,'','','http://www.hikebikemap.de/');
INSERT INTO `tx_odsosm_layer` VALUES (15,0,0,0,0,1592,0,0,'Hillshading (NASA SRTM3 v2)',1,'','','','{s}.tiles.wmflabs.org/hillshading/{z}/{x}/{y}.png',1,0,0,'','','');
INSERT INTO `tx_odsosm_layer` VALUES (15,0,0,0,0,1592,0,1,'Hillshading (NASA SRTM3 v2)',1,'','','','{s}.tiles.wmflabs.org/hillshading/{z}/{x}/{y}.png',1,0,0,'','','');
INSERT INTO `tx_odsosm_layer` VALUES (16,0,0,0,0,1600,0,1,'By Night',1,'','','','{s}.tiles.wmflabs.org/lighting/{z}/{x}/{y}.png',1,0,0,'','','');
INSERT INTO `tx_odsosm_layer` VALUES (17,0,0,0,0,1920,0,0,'Hiking routes',1,'','','','tile.waymarkedtrails.org/hiking/{z}/{x}/{y}.png',1,0,0,'','','http://hiking.waymarkedtrails.org/');
INSERT INTO `tx_odsosm_layer` VALUES (18,0,0,0,0,640,0,0,'Mapnik BW',0,'','','','{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png',1,0,19,'','© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>','http://toolserver.org/~osm/styles/');
Expand All @@ -68,3 +68,4 @@ INSERT INTO `tx_odsosm_layer` VALUES (30,0,0,0,0,1553,0,0,'Stamen Watercolor',0,
INSERT INTO `tx_odsosm_layer` VALUES (31,0,0,0,0,2016,0,1,'Public Transport Lines',1,'','','','www.openptmap.org/tiles/{z}/{x}/{y}.png',1,0,0,'','','http://www.openptmap.org/');
INSERT INTO `tx_odsosm_layer` VALUES (32,0,0,0,0,1555,0,0,'Stamen Terrain Labels',1,'','','','stamen-tiles.a.ssl.fastly.net/terrain-labels/{z}/{x}/{y}.png',1,0,0,'abc','Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://creativecommons.org/licenses/by-sa/3.0\">CC BY SA</a>.','http://maps.stamen.com/');
INSERT INTO `tx_odsosm_layer` VALUES (33,0,0,0,0,2048,0,0,'Railway Infrastructure',1,'','','','{s}.tiles.openrailwaymap.org/standard/{z}/{x}/{y}.png',1,0,0,'abc','© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>','https://www.openrailwaymap.org/');
INSERT INTO `tx_odsosm_layer` VALUES (34,0,0,0,0,1554,0,0,'Stamen Terrain Background',0,'','','','stamen-tiles.a.ssl.fastly.net/terrain-background/{z}/{x}/{y}.png',1,0,0,'abc','Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://creativecommons.org/licenses/by-sa/3.0\">CC BY SA</a>.','http://maps.stamen.com/');