Commit Graph

96 Commits

Author SHA1 Message Date
Bryan Housel dd9e399971 Merge pull request #2984 from openstreetmap/phantomjs-2
Test with phantomjs 2.1 and mocha-phantomjs-core
2016-02-16 22:35:22 -05:00
Bryan Housel 5957adb67d Dynamically check for existence of Mapillary service
This allows us to
1. enable specific parts of Mapillary only for certain browsers
2. remove the Mapillary service completely if desired (closes #2722)

To remove Mapillary, just set `iD.services.mapillary = null`
or remove the <script> tag that loads mapillary.js.
2016-02-15 16:16:44 -05:00
John Firebaugh ac3dfb95a3 Prevent AddPoint tests from making network requests 2016-02-08 19:02:37 -08:00
Bryan Housel 4ffabf8933 Mapillary code cleanup 2016-02-07 01:05:20 -05:00
peterneubauer ea819c0d09 adding a first traffic sign layer, rendering not working properly yet. 2016-02-07 01:02:22 -05:00
Bryan Housel 9bc52598df Replace nonstandard Arrayfind with _.find (closes #2871) 2015-12-11 13:06:42 -08:00
Bryan Housel e5cd08a349 Prefer imagery marked as best (closes #2826)
* Sorts the imagery at the top of the background list
* Pick automatically if the url hash doesn't have another imagery chosen
* also fixes #1310
2015-11-23 21:15:48 -05:00
Bryan Housel 701731485e Less strict polygon intersection test in findOuter (closes #2755) 2015-09-01 14:48:40 -04:00
Rowan Hogan 336f7420e5 Merge branch master into add-task-outline-to-minimap 2015-06-15 10:14:07 +10:00
Denys Digtiar be1e3738f1 Error handling is added to the GPX loading callback.
Previously erroneous response was corrupting the GpxLayer, which could
potential corrupt the whole Map, if user were to use 'Zoom to GPX'
feature. Callback logic is wrapped in the error guard to fix this.
2015-06-14 16:46:20 -07:00
Rowan Hogan 5c860be877 Moved minimap gpx layer methods to the background gpx layer handlers 2015-06-14 12:37:37 +10:00
Bryan Housel 861bd14903 map#trimmedExtentZoom
Like map#extentZoom, but uses trimmed viewport instead of full viewport
to avoid putting the extent under UI buttons and border elements.

This is because in conflict resolution the user will be extentZooming to see
their changes and it was annoying to have the change appear under the UI.

Also using this in zoomToGPXLayer.
2015-02-20 14:59:40 -05:00
Bryan Housel 670c228fc7 put layer-gpx after layer-data
(closes #2352, #2335)
2014-10-28 21:37:01 -04:00
Aaron Lidman 90b0f1c5bf Select first available imagery layer 2014-10-23 15:52:29 -07:00
John Firebaugh dd0e08b244 Write presets and imagery to standalone files 2014-10-23 15:52:29 -07:00
John Firebaugh 0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
Bryan Housel 83030bed54 test visibility of gpx coords instead of just comparing extents. 2014-07-25 23:54:01 -04:00
Bryan Housel 4d40e8f50b When adding gpx, only rezoom map if gpx not in viewport (closes #2297) 2014-07-25 11:59:33 -04:00
John Firebaugh b51e5366cc Zoom to GPX after adding (#2144) 2014-03-21 17:34:46 -07:00
John Firebaugh 4b3db596d7 Remove unnecessary no-op pans 2013-11-22 10:52:58 -08:00
tyr a3d44789f6 rudimental support for providing gpx-files via urls
see #1965 (esp: https://github.com/systemed/iD/issues/1965#issuecomment-29045054)
2013-11-22 13:32:08 +01:00
John Firebaugh 12769d2fc1 Calculate background source name (fixes #1935) 2013-10-29 16:13:40 -07:00
John Firebaugh 1e78ee5c87 Stricter jshint 2013-10-24 16:08:48 -07:00
John Firebaugh 8323c948a7 jshint fixes 2013-10-24 15:33:52 -07:00
John Firebaugh a5311b5f6c Show attribution for overlay layers (fixes #1909) 2013-10-21 12:31:48 -07:00
John Firebaugh a9964589fc Add a button to trigger file browser for GPX (fixes #1758) 2013-10-15 13:15:35 -04:00
Aaron Lidman 1899eb361c Add None tile layer
Fixes #1472
2013-10-14 12:08:36 -04:00
John Firebaugh 4e8cb0b97f Pull imagery from editor-imagery-index 2013-08-27 11:07:46 -07:00
John Firebaugh 77985d65f8 Exclude Locator Overlay from imagery_used 2013-08-23 12:51:58 -07:00
John Firebaugh d9142271ac Add default "Locator Overlay" layer
A layer that is by default visible at <z16 and can
orient you with major roads, cities, borders, etc.

Fixes #1301
2013-08-22 12:53:57 -07:00
John Firebaugh 0180367399 Refactor BackgroundSource 2013-08-22 12:53:57 -07:00
John Firebaugh 7b2eaa2fd8 Remove unused 2013-08-22 11:00:14 -07:00
John Firebaugh 476509111f Fix "Custom" radio button state 2013-07-25 11:58:11 -07:00
John Firebaugh 5f02f348de Include GPX and overlay layers in imagery_used
Fixes #1463
2013-07-25 11:51:55 -07:00
John Firebaugh 7f3f648c1c Support multiple overlays in hash 2013-07-25 11:29:31 -07:00
John Firebaugh 1168053cc2 Coalesce multi-extent imagery sources 2013-07-25 11:14:53 -07:00
John Firebaugh 5e64f6b95d Support multiple overlay layers 2013-07-15 14:05:11 -07:00
John Firebaugh 734d53e08b Refactor background in preparation for multiple overlays 2013-07-15 14:05:11 -07:00
John Firebaugh ab566c8fa7 Respect tile layer minimum scaleExtent
Rather than attempting to render an exponential number
of tiles for each z less that the minimum, render none.
2013-07-12 15:44:59 -07:00
John Firebaugh bba761d8ea size -> dimensions
D3 3.2 adds selection.size, where size means "number
of selected elements".
2013-06-20 13:05:20 -07:00
John Firebaugh e339bd5df3 Fix tile overzooming 2013-06-12 16:49:50 -07:00
John Firebaugh 79ae9346e7 Simplify layer structure
Also, always give SVG elements an explicit size -- seems
to be necessary for Firefox to render them correctly.

Fixes #1436.
2013-05-08 13:10:55 -07:00
Ansis Brammanis 036174d4dd fix turning off tiger overlay, fixes #1349 2013-04-22 12:10:48 -04:00
Tom MacWright f1604df4d0 Add custom layer option to URL hash, fixes #1024.
Layer format is custom:http://url.com/{z}/{x}/{y}.jpg
2013-04-18 17:34:27 -04:00
John Firebaugh fb16dc8af6 Custom d3 3.1 build (fixes #1232) 2013-04-02 15:00:32 -07:00
Ansis Brammanis e13305b162 Merge pull request #1206 from systemed/background-overlay
support for overlay layers
2013-03-29 15:46:34 -07:00
Ansis Brammanis eda5836554 imagery offsets affect only that layer
fixes #1202
2013-03-29 17:18:26 -04:00
Ansis Brammanis 2f04868770 add support for overlay layers
This is mostly added for the Tiger2012 road overlay
2013-03-29 16:42:53 -04:00
John Firebaugh e01d2e611f Display Bing copyrights 2013-03-21 12:23:57 -07:00
Tom MacWright 96cef1d3cb Refactor source menu into proper control and fill it in intially.
Fixes #1084
2013-03-19 13:47:39 -04:00