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

Merge remote-tracking branch 'openstreetmap/master'

Browse Source
This commit is contained in:
David Culverhouse
2016-06-15 00:22:31 -04:00
parent 34904f0525
commit 8313ce284d
13 changed files with 511 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/rendering.html
+2 -4
View File
@@ -34,9 +34,7 @@
<script src='../js/id/core/relation.js'></script>
<script src='../js/id/core/way.js'></script>
<script src='../js/id/presets.js'></script>
<script src='../js/id/presets/collection.js'></script>
<script src='../js/id/presets/preset.js'></script>
<script src='../js/lib/id/presets.js'></script>
<form style="position: fixed; right: 10px; bottom: 10px">
<input id="background-color" type="range" min="0" max="255" value="255">
@@ -61,7 +59,7 @@
};
context.presets = function() {
return iD.presets().load({
return iD.presets.presets().load({
presets: {
"amenity/restaurant": {
geometry: ['point'],