CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 23:44:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move GPX, Mapillary Images, Mapillary Signs into svg namespace

Browse Source
This commit is contained in:
Bryan Housel
2016-02-18 13:49:29 -05:00
parent 352dedcf4d
commit 6c1df37298
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+4 -4
View File
@@ -56,18 +56,18 @@
<script src='js/id/renderer/background.js'></script>
<script src='js/id/renderer/background_source.js'></script>
<script src='js/id/renderer/features.js'></script>
<script src='js/id/renderer/gpx_layer.js'></script>
<script src='js/id/renderer/tile_layer.js'></script>
<script src='js/id/renderer/map.js'></script>
<script src='js/id/renderer/mapillary_image_layer.js'></script>
<script src='js/id/renderer/mapillary_sign_layer.js'></script>
<script src='js/id/renderer/tile_layer.js'></script>
<script src="js/id/svg.js"></script>
<script src="js/id/svg/areas.js"></script>
<script src="js/id/svg/defs.js"></script>
<script src='js/id/svg/gpx.js'></script>
<script src="js/id/svg/icon.js"></script>
<script src="js/id/svg/labels.js"></script>
<script src="js/id/svg/lines.js"></script>
<script src='js/id/svg/mapillary_images.js'></script>
<script src='js/id/svg/mapillary_signs.js'></script>
<script src="js/id/svg/midpoints.js"></script>
<script src="js/id/svg/points.js"></script>
<script src="js/id/svg/surface.js"></script>
js/id/renderer/background.js
+3 -3
View File
@@ -2,7 +2,7 @@ iD.Background = function(context) {
var dispatch = d3.dispatch('change'),
baseLayer = iD.TileLayer()
.projection(context.projection),
gpxLayer = iD.GpxLayer(context, dispatch)
gpxLayer = iD.svg.Gpx(context, dispatch)
.projection(context.projection),
mapillaryImageLayer,
mapillarySignLayer,
@@ -98,7 +98,7 @@ iD.Background = function(context) {
.attr('class', 'layer-layer layer-mapillary-images');
if (supportsMapillaryImages) {
if (!mapillaryImageLayer) { mapillaryImageLayer = iD.MapillaryImageLayer(context); }
if (!mapillaryImageLayer) { mapillaryImageLayer = iD.svg.MapillaryImages(context); }
mapillaryImages.call(mapillaryImageLayer);
} else {
mapillaryImageLayer = null;
@@ -115,7 +115,7 @@ iD.Background = function(context) {
.attr('class', 'layer-layer layer-mapillary-signs');
if (supportsMapillarySigns) {
if (!mapillarySignLayer) { mapillarySignLayer = iD.MapillarySignLayer(context); }
if (!mapillarySignLayer) { mapillarySignLayer = iD.svg.MapillarySigns(context); }
mapillarySigns.call(mapillarySignLayer);
} else {
mapillarySignLayer = null;
js/id/renderer/gpx_layer.js → js/id/svg/gpx.js
+1 -1
View File
@@ -1,4 +1,4 @@
iD.GpxLayer = function(context) {
iD.svg.Gpx = function(context) {
var projection,
gj = {},
enable = true,
js/id/renderer/mapillary_image_layer.js → js/id/svg/mapillary_images.js
+1 -1
View File
@@ -1,4 +1,4 @@
iD.MapillaryImageLayer = function(context) {
iD.svg.MapillaryImages = function(context) {
var debouncedRedraw = _.debounce(function () { context.pan([0,0]); }, 1000),
enabled = false,
minZoom = 12,
js/id/renderer/mapillary_sign_layer.js → js/id/svg/mapillary_signs.js
+1 -1
View File
@@ -1,4 +1,4 @@
iD.MapillarySignLayer = function(context) {
iD.svg.MapillarySigns = function(context) {
var debouncedRedraw = _.debounce(function () { context.pan([0,0]); }, 1000),
enabled = false,
minZoom = 12,
js/id/ui/map_in_map.js
+1 -2
View File
@@ -2,11 +2,10 @@ iD.ui.MapInMap = function(context) {
var key = '/';
function map_in_map(selection) {
var backgroundLayer = iD.TileLayer(),
overlayLayers = {},
dispatch = d3.dispatch('change'),
gpxLayer = iD.GpxLayer(context, dispatch),
gpxLayer = iD.svg.Gpx(context, dispatch),
projection = iD.geo.RawMercator(),
zoom = d3.behavior.zoom()
.scaleExtent([ztok(0.5), ztok(24)])
test/index.html
+3 -3
View File
@@ -62,17 +62,17 @@
<script src='../js/id/renderer/background_source.js'></script>
<script src='../js/id/renderer/features.js'></script>
<script src='../js/id/renderer/map.js'></script>
<script src='../js/id/renderer/gpx_layer.js'></script>
<script src='../js/id/renderer/tile_layer.js'></script>
<script src='../js/id/renderer/mapillary_image_layer.js'></script>
<script src='../js/id/renderer/mapillary_sign_layer.js'></script>
<script src="../js/id/svg.js"></script>
<script src="../js/id/svg/areas.js"></script>
<script src="../js/id/svg/defs.js"></script>
<script src='../js/id/svg/gpx.js'></script>
<script src="../js/id/svg/icon.js"></script>
<script src="../js/id/svg/labels.js"></script>
<script src="../js/id/svg/lines.js"></script>
<script src='../js/id/svg/mapillary_images.js'></script>
<script src='../js/id/svg/mapillary_signs.js'></script>
<script src="../js/id/svg/midpoints.js"></script>
<script src="../js/id/svg/points.js"></script>
<script src="../js/id/svg/surface.js"></script>