Compare commits
	
		
			No commits in common. "a0d41c388b94b2113fe402cd7de26414ced2feb5" and "95553296bd57c3d6cbf61a6486b28d07af43d904" have entirely different histories.
		
	
	
		
			a0d41c388b
			...
			95553296bd
		
	
		
@ -310,21 +310,6 @@
 | 
			
		||||
                var placeId = addedPlaces[i].id;
 | 
			
		||||
                places[tempId].id = placeId;
 | 
			
		||||
            }
 | 
			
		||||
        },
 | 
			
		||||
 | 
			
		||||
        // TODO: check whether marker is already existing on the map for the coordinates
 | 
			
		||||
        //       or alternatively block saving for matching coordinates
 | 
			
		||||
        placeMarker: function (latlng) {
 | 
			
		||||
            var marker = L.marker(latlng, {
 | 
			
		||||
                icon: IconCollection.iconBlue,
 | 
			
		||||
                zIndexOffset: 2000
 | 
			
		||||
            })
 | 
			
		||||
                .addTo(MapEditor.map)
 | 
			
		||||
                .on('click', function () {
 | 
			
		||||
                    MapEditor.select(this);
 | 
			
		||||
                });
 | 
			
		||||
 | 
			
		||||
            MapEditor.select(marker);
 | 
			
		||||
        }
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
@ -355,32 +340,6 @@
 | 
			
		||||
            } else {
 | 
			
		||||
                return { ppi: 72, tileSize: 512, zoomOffset: -1, minZoom: 2, maxZoom: 20 };
 | 
			
		||||
            }
 | 
			
		||||
        },
 | 
			
		||||
 | 
			
		||||
        extractCoordinates: function (coordinatesStr) {
 | 
			
		||||
            var coordinates = { valid: false, latlng: { lat: 0., lng: 0. } };
 | 
			
		||||
            var delimiters = [',', ' ', ';'];
 | 
			
		||||
 | 
			
		||||
            coordinatesStr = coordinatesStr.trim();
 | 
			
		||||
            if (coordinatesStr.length == 0) {
 | 
			
		||||
                return coordinates;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (var delimiter of delimiters) {
 | 
			
		||||
                if (coordinatesStr.indexOf(delimiter) != -1) {
 | 
			
		||||
 | 
			
		||||
                    var coordinatesArr = coordinatesStr.split(delimiter);
 | 
			
		||||
                    coordinates.latlng.lat = parseFloat(coordinatesArr[0]);
 | 
			
		||||
                    coordinates.latlng.lng = parseFloat(coordinatesArr[1]);
 | 
			
		||||
 | 
			
		||||
                    if (!isNaN(coordinates.latlng.lat) && !isNaN(coordinates.latlng.lng)) {
 | 
			
		||||
                        coordinates.valid = true;
 | 
			
		||||
                        return coordinates;
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            return coordinates;
 | 
			
		||||
        }
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
@ -389,7 +348,16 @@
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    MapEditor.map.on('click', function (e) {
 | 
			
		||||
        MapEditor.placeMarker(e.latlng);
 | 
			
		||||
        var marker = L.marker(e.latlng, {
 | 
			
		||||
            icon: IconCollection.iconBlue,
 | 
			
		||||
            zIndexOffset: 2000
 | 
			
		||||
        })
 | 
			
		||||
            .addTo(MapEditor.map)
 | 
			
		||||
            .on('click', function () {
 | 
			
		||||
                MapEditor.select(this);
 | 
			
		||||
            });
 | 
			
		||||
 | 
			
		||||
        MapEditor.select(marker);
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    var highResData = Util.getHighResData();
 | 
			
		||||
@ -472,31 +440,4 @@
 | 
			
		||||
    document.getElementById('deleteButton').onclick = function () {
 | 
			
		||||
        MapEditor.deletePlace();
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    document.getElementById('jumpButton').onclick = function (e) {
 | 
			
		||||
        var coordinatesStr = document.getElementById("jumpCoordinates").value;
 | 
			
		||||
        var coordinates = Util.extractCoordinates(coordinatesStr);
 | 
			
		||||
 | 
			
		||||
        if (coordinates.valid) {
 | 
			
		||||
            MapEditor.placeMarker(coordinates.latlng);
 | 
			
		||||
        }
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    document.getElementById('jumpCoordinates').onkeyup = function (e) {
 | 
			
		||||
        var coordinatesStr = document.getElementById("jumpCoordinates").value;
 | 
			
		||||
        var coordinates = Util.extractCoordinates(coordinatesStr);
 | 
			
		||||
        var jumpButton = document.getElementById("jumpButton");
 | 
			
		||||
 | 
			
		||||
        if (coordinates.valid) {
 | 
			
		||||
            jumpButton.disabled = false;
 | 
			
		||||
 | 
			
		||||
            if (e.key == 'Enter') {
 | 
			
		||||
                MapEditor.placeMarker(coordinates.latlng);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        else {
 | 
			
		||||
            jumpButton.disabled = true;
 | 
			
		||||
        }
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
})();
 | 
			
		||||
 | 
			
		||||
@ -10,12 +10,8 @@
 | 
			
		||||
 | 
			
		||||
@extends(templates/layout_full)
 | 
			
		||||
 | 
			
		||||
@section(subheader) 
 | 
			
		||||
@section(subheader)
 | 
			
		||||
           <span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
 | 
			
		||||
        --><span>
 | 
			
		||||
               <input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
 | 
			
		||||
               <button id="jumpButton" disabled >Jump</button>
 | 
			
		||||
           </span><!--
 | 
			
		||||
        --><span><!--
 | 
			
		||||
            <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
 | 
			
		||||
            --><svg class="inline" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user