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

Update maki (fixes #1429)

Browse Source
This commit is contained in:
John Firebaugh
2013-05-08 17:39:35 -07:00
parent c7dedcb5ba
commit 23d70230fc
11 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/feature-icons.css
+74 -69
View File
@@ -21,75 +21,80 @@
.feature-cinema{background-position:-0px -994px;}
.feature-circle{background-position:-0px -1054px;}
.feature-circle-stroked{background-position:-0px -1114px;}
.feature-college{background-position:-0px -1174px;}
.feature-commercial{background-position:-0px -1234px;}
.feature-cricket{background-position:-0px -1294px;}
.feature-cross{background-position:-0px -1354px;}
.feature-dam{background-position:-0px -1414px;}
.feature-danger{background-position:-0px -1474px;}
.feature-disability{background-position:-0px -1534px;}
.feature-embassy{background-position:-0px -1594px;}
.feature-emergency-telephone{background-position:-0px -1654px;}
.feature-fast-food{background-position:-0px -1714px;}
.feature-ferry{background-position:-0px -1774px;}
.feature-fire-station{background-position:-0px -1834px;}
.feature-fuel{background-position:-0px -1894px;}
.feature-garden{background-position:-0px -1954px;}
.feature-golf{background-position:-0px -2014px;}
.feature-grocery{background-position:-0px -2074px;}
.feature-harbor{background-position:-0px -2134px;}
.feature-heliport{background-position:-0px -2194px;}
.feature-hospital{background-position:-0px -2254px;}
.feature-industrial{background-position:-0px -2314px;}
.feature-library{background-position:-0px -2374px;}
.feature-lodging{background-position:-0px -2434px;}
.feature-logging{background-position:-0px -2494px;}
.feature-marker{background-position:-0px -2554px;}
.feature-marker-stroked{background-position:-0px -2614px;}
.feature-monument{background-position:-0px -2674px;}
.feature-museum{background-position:-0px -2734px;}
.feature-music{background-position:-0px -2794px;}
.feature-oil-well{background-position:-0px -2854px;}
.feature-park{background-position:-0px -2914px;}
.feature-park2{background-position:-0px -2974px;}
.feature-parking{background-position:-0px -3034px;}
.feature-parking-garage{background-position:-0px -3094px;}
.feature-pharmacy{background-position:-0px -3154px;}
.feature-pitch{background-position:-0px -3214px;}
.feature-place-of-worship{background-position:-0px -3274px;}
.feature-police{background-position:-0px -3334px;}
.feature-post{background-position:-0px -3394px;}
.feature-prison{background-position:-0px -3454px;}
.feature-rail{background-position:-0px -3514px;}
.feature-rail-above{background-position:-0px -3574px;}
.feature-rail-underground{background-position:-0px -3634px;}
.feature-religious-christian{background-position:-0px -3694px;}
.feature-religious-jewish{background-position:-0px -3754px;}
.feature-religious-muslim{background-position:-0px -3814px;}
.feature-restaurant{background-position:-0px -3874px;}
.feature-roadblock{background-position:-0px -3934px;}
.feature-school{background-position:-0px -3994px;}
.feature-shop{background-position:-0px -4054px;}
.feature-skiing{background-position:-0px -4114px;}
.feature-slaughterhouse{background-position:-0px -4174px;}
.feature-soccer{background-position:-0px -4234px;}
.feature-square{background-position:-0px -4294px;}
.feature-square-stroked{background-position:-0px -4354px;}
.feature-star{background-position:-0px -4414px;}
.feature-star-stroked{background-position:-0px -4474px;}
.feature-swimming{background-position:-0px -4534px;}
.feature-telephone{background-position:-0px -4594px;}
.feature-tennis{background-position:-0px -4654px;}
.feature-theatre{background-position:-0px -4714px;}
.feature-toilets{background-position:-0px -4774px;}
.feature-town-hall{background-position:-0px -4834px;}
.feature-triangle{background-position:-0px -4894px;}
.feature-triangle-stroked{background-position:-0px -4954px;}
.feature-warehouse{background-position:-0px -5014px;}
.feature-waste-basket{background-position:-0px -5074px;}
.feature-water{background-position:-0px -5134px;}
.feature-wetland{background-position:-0px -5194px;}
.feature-zoo{background-position:-0px -5254px;}
.feature-city{background-position:-0px -1174px;}
.feature-college{background-position:-0px -1234px;}
.feature-commercial{background-position:-0px -1294px;}
.feature-cricket{background-position:-0px -1354px;}
.feature-cross{background-position:-0px -1414px;}
.feature-dam{background-position:-0px -1474px;}
.feature-danger{background-position:-0px -1534px;}
.feature-disability{background-position:-0px -1594px;}
.feature-embassy{background-position:-0px -1654px;}
.feature-emergency-telephone{background-position:-0px -1714px;}
.feature-farm{background-position:-0px -1774px;}
.feature-fast-food{background-position:-0px -1834px;}
.feature-ferry{background-position:-0px -1894px;}
.feature-fire-station{background-position:-0px -1954px;}
.feature-fuel{background-position:-0px -2014px;}
.feature-garden{background-position:-0px -2074px;}
.feature-golf{background-position:-0px -2134px;}
.feature-grocery{background-position:-0px -2194px;}
.feature-harbor{background-position:-0px -2254px;}
.feature-heliport{background-position:-0px -2314px;}
.feature-hospital{background-position:-0px -2374px;}
.feature-industrial{background-position:-0px -2434px;}
.feature-land-use{background-position:-0px -2494px;}
.feature-library{background-position:-0px -2554px;}
.feature-lodging{background-position:-0px -2614px;}
.feature-logging{background-position:-0px -2674px;}
.feature-marker{background-position:-0px -2734px;}
.feature-marker-stroked{background-position:-0px -2794px;}
.feature-monument{background-position:-0px -2854px;}
.feature-museum{background-position:-0px -2914px;}
.feature-music{background-position:-0px -2974px;}
.feature-oil-well{background-position:-0px -3034px;}
.feature-park{background-position:-0px -3094px;}
.feature-park2{background-position:-0px -3154px;}
.feature-parking{background-position:-0px -3214px;}
.feature-parking-garage{background-position:-0px -3274px;}
.feature-pharmacy{background-position:-0px -3334px;}
.feature-pitch{background-position:-0px -3394px;}
.feature-place-of-worship{background-position:-0px -3454px;}
.feature-police{background-position:-0px -3514px;}
.feature-post{background-position:-0px -3574px;}
.feature-prison{background-position:-0px -3634px;}
.feature-rail{background-position:-0px -3694px;}
.feature-rail-above{background-position:-0px -3754px;}
.feature-rail-underground{background-position:-0px -3814px;}
.feature-religious-christian{background-position:-0px -3874px;}
.feature-religious-jewish{background-position:-0px -3934px;}
.feature-religious-muslim{background-position:-0px -3994px;}
.feature-restaurant{background-position:-0px -4054px;}
.feature-roadblock{background-position:-0px -4114px;}
.feature-school{background-position:-0px -4174px;}
.feature-shop{background-position:-0px -4234px;}
.feature-skiing{background-position:-0px -4294px;}
.feature-slaughterhouse{background-position:-0px -4354px;}
.feature-soccer{background-position:-0px -4414px;}
.feature-square{background-position:-0px -4474px;}
.feature-square-stroked{background-position:-0px -4534px;}
.feature-star{background-position:-0px -4594px;}
.feature-star-stroked{background-position:-0px -4654px;}
.feature-swimming{background-position:-0px -4714px;}
.feature-telephone{background-position:-0px -4774px;}
.feature-tennis{background-position:-0px -4834px;}
.feature-theatre{background-position:-0px -4894px;}
.feature-toilets{background-position:-0px -4954px;}
.feature-town{background-position:-0px -5014px;}
.feature-town-hall{background-position:-0px -5074px;}
.feature-triangle{background-position:-0px -5134px;}
.feature-triangle-stroked{background-position:-0px -5194px;}
.feature-village{background-position:-0px -5254px;}
.feature-warehouse{background-position:-0px -5314px;}
.feature-waste-basket{background-position:-0px -5374px;}
.feature-water{background-position:-0px -5434px;}
.feature-wetland{background-position:-0px -5494px;}
.feature-zoo{background-position:-0px -5554px;}
.preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
.preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
.preset-icon-line.feature-highway-primary{background-position:-140px -25px;}
data/feature-icons.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/presets/categories.json
+1 -1
View File
@@ -2,7 +2,7 @@
"category-landuse": {
"geometry": "area",
"name": "Land Use",
"icon": "category-landuse",
"icon": "land-use",
"members": [
"landuse/residential",
"landuse/industrial",
data/presets/categories/landuse.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"geometry": "area",
"name": "Land Use",
"icon": "category-landuse",
"icon": "land-use",
"members": [
"landuse/residential",
"landuse/industrial",
data/presets/presets.json
+5 -4
View File
@@ -2147,7 +2147,8 @@
"landuse": "farm"
},
"terms": [],
"name": "Farm"
"name": "Farm",
"icon": "farm"
},
"landuse/farmyard": {
"geometry": [
@@ -2952,7 +2953,7 @@
"name": "Place"
},
"place/city": {
"icon": "square",
"icon": "city",
"geometry": [
"point",
"area"
@@ -3015,7 +3016,7 @@
"name": "Locality"
},
"place/town": {
"icon": "square-stroked",
"icon": "town",
"geometry": [
"point",
"area"
@@ -3026,7 +3027,7 @@
"name": "Town"
},
"place/village": {
"icon": "triangle",
"icon": "village",
"geometry": [
"point",
"area"
data/presets/presets/landuse/farm.json
+2 -1
View File
@@ -7,5 +7,6 @@
"landuse": "farm"
},
"terms": [],
"name": "Farm"
"name": "Farm",
"icon": "farm"
}
data/presets/presets/place/city.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "square",
"icon": "city",
"geometry": [
"point",
"area"
data/presets/presets/place/town.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "square-stroked",
"icon": "town",
"geometry": [
"point",
"area"
data/presets/presets/place/village.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "triangle",
"icon": "village",
"geometry": [
"point",
"area"
dist/img/maki-sprite.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 86 KiB

package.json
+1 -1
View File
@@ -23,7 +23,7 @@
"d3": "3",
"smash": "0.0",
"uglify-js": "~2.2.5",
"maki": "git://github.com/mapbox/maki.git#0001ab8a8a03e2517fab0f76f44422dd08f6faa3",
"maki": "0.1",
"mocha": "~1.9",
"mocha-phantomjs": "~1.1.1",
"chai": "~1.4",