mirror of
https://github.com/FoggedLens/iD.git
synced 2026-06-04 05:58:09 +02:00
Merge remote-tracking branch 'systemed/master' into labels
Conflicts: js/id/svg/lines.js js/id/svg/surface.js
This commit is contained in:
Ansis Brammanis
+380
-136
@@ -7,7 +7,7 @@ g.point circle {
|
||||
fill:#fff;
|
||||
}
|
||||
|
||||
g.point.hover circle.stroke,
|
||||
g.pointer circle.stroke,
|
||||
g.point.selected circle.stroke {
|
||||
fill:#333;
|
||||
-webkit-transform:scale(1.2, 1.2);
|
||||
@@ -15,131 +15,150 @@ g.point.selected circle.stroke {
|
||||
transform:scale(1.2, 1.2);
|
||||
}
|
||||
|
||||
/* interactive elements */
|
||||
g.vertex circle.fill {
|
||||
/* vertices */
|
||||
|
||||
g.vertex .fill {
|
||||
fill:white;
|
||||
}
|
||||
g.vertex .stroke {
|
||||
stroke:#333;
|
||||
stroke-width:2;
|
||||
fill:white;
|
||||
fill-opacity:1;
|
||||
}
|
||||
|
||||
circle.stroke,
|
||||
circle.fill {
|
||||
-webkit-transition: -webkit-transform 50ms linear;
|
||||
transition: transform 50ms linear;
|
||||
-moz-transition: stroke 50ms linear;
|
||||
-webkit-transform:scale(1, 1);
|
||||
-moz-transform:scale(1, 1);
|
||||
transform:scale(1, 1);
|
||||
svg[data-zoom="16"] g.vertex .shadow {
|
||||
-webkit-transform:scale(0.8, 0.8);
|
||||
-moz-transform:scale(0.8, 0.8);
|
||||
transform:scale(0.8, 0.8);
|
||||
}
|
||||
|
||||
svg[data-zoom="16"] g.vertex circle.stroke,
|
||||
svg[data-zoom="16"] g.vertex circle.fill {
|
||||
svg[data-zoom="16"] g.vertex .stroke,
|
||||
svg[data-zoom="16"] g.vertex .fill {
|
||||
-webkit-transform:scale(0.6, 0.6);
|
||||
-moz-transform:scale(0.6, 0.6);
|
||||
transform:scale(0.6, 0.6);
|
||||
}
|
||||
|
||||
svg[data-zoom="17"] g.vertex circle.stroke,
|
||||
svg[data-zoom="17"] g.vertex circle.fill {
|
||||
svg[data-zoom="17"] g.vertex .shadow {
|
||||
-webkit-transform:scale(0.9, 0.9);
|
||||
-moz-transform:scale(0.9, 0.9);
|
||||
transform:scale(0.9, 0.9);
|
||||
}
|
||||
svg[data-zoom="17"] g.vertex .stroke,
|
||||
svg[data-zoom="17"] g.vertex .fill {
|
||||
-webkit-transform:scale(0.7, 0.7);
|
||||
-moz-transform:scale(0.7, 0.7);
|
||||
transform:scale(0.7, 0.7);
|
||||
}
|
||||
|
||||
path.casing.tag-highway {
|
||||
stroke-width:10;
|
||||
g.vertex.shared .shadow {
|
||||
-webkit-transform:scale(1.2, 1.2);
|
||||
-moz-transform:scale(1.2, 1.2);
|
||||
transform:scale(1.2, 1.2);
|
||||
}
|
||||
g.vertex.shared .fill,
|
||||
g.vertex.shared .stroke {
|
||||
-webkit-transform:scale(1.1, 1.1);
|
||||
-moz-transform:scale(1.1, 1.1);
|
||||
transform:scale(1.1, 1.1);
|
||||
}
|
||||
svg[data-zoom="16"] g.vertex.shared .shadow {
|
||||
-webkit-transform:scale(0.9, 0.9);
|
||||
-moz-transform:scale(0.9, 0.9);
|
||||
transform:scale(0.9, 0.9);
|
||||
}
|
||||
svg[data-zoom="16"] g.vertex.shared .fill,
|
||||
svg[data-zoom="16"] g.vertex.shared .stroke {
|
||||
-webkit-transform:scale(0.8, 0.8);
|
||||
-moz-transform:scale(0.8, 0.8);
|
||||
transform:scale(0.8, 0.8);
|
||||
}
|
||||
svg[data-zoom="17"] g.vertex.shared .shadow {
|
||||
-webkit-transform:scale(1, 1);
|
||||
-moz-transform:scale(1, 1);
|
||||
transform:scale(1, 1);
|
||||
}
|
||||
svg[data-zoom="17"] g.vertex.shared .fill,
|
||||
svg[data-zoom="17"] g.vertex.shared .stroke {
|
||||
-webkit-transform:scale(0.9, 0.9);
|
||||
-moz-transform:scale(0.9, 0.9);
|
||||
transform:scale(0.9, 0.9);
|
||||
}
|
||||
|
||||
path.stroke.tag-highway {
|
||||
stroke-width:8;
|
||||
}
|
||||
|
||||
svg[data-zoom="16"] path.casing.tag-highway {
|
||||
stroke-width:6;
|
||||
}
|
||||
|
||||
svg[data-zoom="16"] path.stroke.tag-highway {
|
||||
stroke-width:4;
|
||||
}
|
||||
|
||||
g.vertex circle.stroke {
|
||||
fill:#333;
|
||||
}
|
||||
|
||||
g.vertex.shared circle.fill {
|
||||
fill:#aff;
|
||||
}
|
||||
g.vertex.shared circle.stroke {
|
||||
fill:#044;
|
||||
}
|
||||
|
||||
g.vertex.hover circle.fill {
|
||||
-webkit-transform:scale(1.5, 1.5);
|
||||
-moz-transform:scale(1.5, 1.5);
|
||||
transform:scale(1.5, 1.5);
|
||||
}
|
||||
|
||||
g.vertex.hover circle.stroke {
|
||||
-webkit-transform:scale(1.4, 1.4);
|
||||
-moz-transform:scale(1.4, 1.4);
|
||||
transform:scale(1.4, 1.4);
|
||||
}
|
||||
|
||||
g.vertex circle.selected.fill {
|
||||
fill: #ffff00;
|
||||
}
|
||||
g.vertex circle.selected.stroke {
|
||||
fill: #38380A;
|
||||
}
|
||||
|
||||
circle.midpoint {
|
||||
g.vertex.shared .fill {
|
||||
fill:#aaa;
|
||||
stroke:#333;
|
||||
fill-opacity:1;
|
||||
stroke-width:1;
|
||||
}
|
||||
|
||||
circle.teaser-point {
|
||||
stroke-width: 2;
|
||||
stroke:#1DCAFF;
|
||||
fill:#D3F5FF;
|
||||
g.vertex .shadow {
|
||||
fill: none;
|
||||
pointer-events: all;
|
||||
stroke-width: 10;
|
||||
-webkit-transition: -webkit-transform 100ms linear;
|
||||
transition: transform 100ms linear;
|
||||
-moz-transition: fill 100ms linear;
|
||||
}
|
||||
g.vertex.hover .shadow {
|
||||
fill: #E96666;
|
||||
fill-opacity: 0.3;
|
||||
}
|
||||
g.vertex.selected .shadow {
|
||||
fill: #E96666;
|
||||
fill-opacity: 0.7;
|
||||
}
|
||||
|
||||
path.casing {
|
||||
stroke: #111;
|
||||
stroke-linecap:round;
|
||||
stroke-linejoin:bevel;
|
||||
stroke-width: 3;
|
||||
-webkit-transition: stroke 100ms linear;
|
||||
/* midpoints */
|
||||
|
||||
g.midpoint .fill {
|
||||
fill:#aaa;
|
||||
}
|
||||
g.midpoint .fill.hover {
|
||||
fill:#fff;
|
||||
stroke:#000;
|
||||
}
|
||||
|
||||
path.casing.hover {
|
||||
stroke:#FF0F0F !important;
|
||||
stroke-opacity:0.8;
|
||||
g.midpoint .shadow {
|
||||
fill: none;
|
||||
pointer-events: all;
|
||||
stroke-width: 10;
|
||||
-webkit-transition: -webkit-transform 100ms linear;
|
||||
transition: transform 100ms linear;
|
||||
-moz-transition: fill 100ms linear;
|
||||
}
|
||||
g.midpoint .shadow.hover {
|
||||
fill:#E96666;
|
||||
fill-opacity: 0.3;
|
||||
}
|
||||
|
||||
path.casing.selected {
|
||||
stroke:#E96666 !important;
|
||||
stroke-opacity:1 !important;
|
||||
stroke-width:10 !important;
|
||||
/* lines */
|
||||
|
||||
path.line {
|
||||
stroke-linecap: round;
|
||||
stroke-linejoin: bevel;
|
||||
}
|
||||
|
||||
path.stroke {
|
||||
stroke: #555;
|
||||
stroke-linecap:round;
|
||||
stroke-linejoin:bevel;
|
||||
stroke: #222;
|
||||
stroke-width: 2;
|
||||
}
|
||||
|
||||
path.stroke.tag-railway-rail {
|
||||
stroke: white;
|
||||
stroke-width: 3;
|
||||
stroke-dasharray: 12,12;
|
||||
path.stroke,
|
||||
path.casing {
|
||||
shape-rendering: optimizeSpeed;
|
||||
}
|
||||
|
||||
path.stroke.tag-railway-subway {
|
||||
stroke: #444;
|
||||
stroke-width: 3;
|
||||
stroke-dasharray: 8,8;
|
||||
path.shadow {
|
||||
pointer-events: stroke;
|
||||
stroke-width: 10;
|
||||
-webkit-transition: stroke 100ms linear;
|
||||
}
|
||||
|
||||
path.shadow.hover {
|
||||
stroke: #E96666;
|
||||
stroke-opacity: 0.3;
|
||||
}
|
||||
|
||||
path.shadow.selected {
|
||||
stroke: #E96666;
|
||||
stroke-opacity: 0.7;
|
||||
}
|
||||
|
||||
path.area,
|
||||
@@ -206,81 +225,209 @@ path.multipolygon.tag-amenity-parking {
|
||||
}
|
||||
|
||||
/* highways */
|
||||
path.stroke.tag-highway-residential {
|
||||
stroke:#fff;
|
||||
|
||||
path.shadow.tag-highway {
|
||||
stroke-width:16;
|
||||
}
|
||||
path.casing.tag-highway-residential {
|
||||
path.casing.tag-highway {
|
||||
stroke:#444;
|
||||
stroke-width:10;
|
||||
}
|
||||
path.stroke.tag-highway {
|
||||
stroke:#ccc;
|
||||
stroke-width:8;
|
||||
}
|
||||
|
||||
svg[data-zoom="16"] path.shadow.tag-highway {
|
||||
stroke-width:12;
|
||||
}
|
||||
svg[data-zoom="16"] path.casing.tag-highway {
|
||||
stroke-width:6;
|
||||
}
|
||||
svg[data-zoom="16"] path.stroke.tag-highway {
|
||||
stroke-width:4;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-motorway,
|
||||
path.stroke.tag-highway-motorway_link,
|
||||
path.stroke.tag-construction-motorway {
|
||||
stroke:#809bc0;
|
||||
}
|
||||
path.casing.tag-highway-motorway,
|
||||
path.casing.tag-highway-motorway_link,
|
||||
path.casing.tag-construction-motorway {
|
||||
stroke:#506077;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-trunk,
|
||||
path.stroke.tag-highway-trunk_link,
|
||||
path.stroke.tag-construction-trunk {
|
||||
stroke:#97d397;
|
||||
}
|
||||
path.casing.tag-highway-trunk,
|
||||
path.casing.tag-highway-trunk_link,
|
||||
path.casing.tag-construction-trunk {
|
||||
stroke:#477147;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-primary,
|
||||
path.stroke.tag-highway-primary_link,
|
||||
path.stroke.tag-construction-primary {
|
||||
stroke:#ec989a;
|
||||
}
|
||||
path.casing.tag-highway-primary,
|
||||
path.casing.tag-highway-primary_link,
|
||||
path.casing.tag-construction-primary {
|
||||
stroke:#8d4346;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-secondary,
|
||||
path.stroke.tag-highway-secondary_link,
|
||||
path.stroke.tag-construction-secondary {
|
||||
stroke:#fecc8b;
|
||||
}
|
||||
path.casing.tag-highway-secondary,
|
||||
path.casing.tag-highway-secondary_link,
|
||||
path.casing.tag-construction-secondary {
|
||||
stroke:#a37b48;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-tertiary,
|
||||
path.stroke.tag-highway-tertiary_link,
|
||||
path.stroke.tag-construction-tertiary {
|
||||
stroke:#ffffb3;
|
||||
}
|
||||
path.casing.tag-highway-tertiary,
|
||||
path.casing.tag-highway-tertiary_link,
|
||||
path.casing.tag-construction-tertiary {
|
||||
stroke:#bbb;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-unclassified,
|
||||
path.stroke.tag-highway-tertiary,
|
||||
path.stroke.tag-highway-tertiary_link {
|
||||
stroke:#FEFECB;
|
||||
path.stroke.tag-construction-unclassified {
|
||||
stroke:#eaeaea;
|
||||
}
|
||||
path.casing.tag-highway-unclassified,
|
||||
path.casing.tag-construction-unclassified {
|
||||
stroke:#444;
|
||||
}
|
||||
|
||||
path.casing.tag-highway-unclassified,
|
||||
path.casing.tag-highway-tertiary,
|
||||
path.casing.tag-highway-tertiary_link { }
|
||||
path.stroke.tag-highway-residential,
|
||||
path.stroke.tag-construction-residential {
|
||||
stroke:#fff;
|
||||
}
|
||||
path.casing.tag-highway-residential,
|
||||
path.casing.tag-construction-residential {
|
||||
stroke:#444;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-service {
|
||||
path.stroke.tag-highway-living_street {
|
||||
stroke:#ccc;
|
||||
stroke-width:4;
|
||||
}
|
||||
path.casing.tag-highway-living_street {
|
||||
stroke:#fff;
|
||||
stroke-width:6;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-pedestrian {
|
||||
stroke:#fff;
|
||||
stroke-dasharray: 2, 8;
|
||||
stroke-width:4 !important;
|
||||
shapeRendering: auto;
|
||||
}
|
||||
path.casing.tag-highway-pedestrian {
|
||||
stroke:#84C382;
|
||||
stroke-width:6 !important;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-service {
|
||||
stroke:#fff;
|
||||
stroke-width:4;
|
||||
}
|
||||
path.casing.tag-highway-service {
|
||||
stroke-width:8;
|
||||
stroke:#666;
|
||||
stroke-width:6;
|
||||
}
|
||||
svg[data-zoom="16"] path.stroke.tag-highway-service {
|
||||
stroke-width:2;
|
||||
}
|
||||
svg[data-zoom="16"] path.casing.tag-highway-service {
|
||||
stroke-width:4;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-track {
|
||||
stroke: #fff;
|
||||
stroke-width: 4;
|
||||
}
|
||||
path.casing.tag-highway-track {
|
||||
stroke: #996600;
|
||||
stroke-width: 6;
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 6, 6;
|
||||
}
|
||||
svg[data-zoom="16"] path.stroke.tag-highway-track {
|
||||
stroke-width:2;
|
||||
}
|
||||
svg[data-zoom="16"] path.casing.tag-highway-track {
|
||||
stroke-width:4;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-path {
|
||||
stroke: #000;
|
||||
stroke-width: 1 !important;
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 8, 4;
|
||||
}
|
||||
path.casing.tag-highway-path {
|
||||
stroke-width: 1 !important;
|
||||
stroke: #fff;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-footway,
|
||||
path.stroke.tag-highway-cycleway,
|
||||
path.stroke.tag-highway-steps {
|
||||
stroke: #ff6257;
|
||||
path.stroke.tag-highway-bridleway {
|
||||
stroke-width: 4;
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 6, 6;
|
||||
}
|
||||
path.casing.tag-highway-footway,
|
||||
path.casing.tag-highway-cycleway,
|
||||
path.casing.tag-highway-steps {
|
||||
path.casing.tag-highway-bridleway {
|
||||
stroke-width: 6;
|
||||
stroke: #fff;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-motorway,
|
||||
path.stroke.tag-highway-motorway_link {
|
||||
stroke:#809BC0;
|
||||
svg[data-zoom="16"] path.stroke.tag-highway-footway,
|
||||
svg[data-zoom="16"] path.stroke.tag-highway-cycleway,
|
||||
svg[data-zoom="16"] path.stroke.tag-highway-bridleway {
|
||||
stroke-width: 2;
|
||||
}
|
||||
path.casing.tag-highway-motorway,
|
||||
path.casing.tag-highway-motorway_link {
|
||||
stroke:#809BC0;
|
||||
stroke-opacity:0.4;
|
||||
svg[data-zoom="16"] path.casing.tag-highway-footway,
|
||||
svg[data-zoom="16"] path.casing.tag-highway-cycleway,
|
||||
svg[data-zoom="16"] path.casing.tag-highway-bridleway {
|
||||
stroke-width: 4;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-trunk,
|
||||
path.stroke.tag-highway-trunk_link {
|
||||
stroke-opacity:0.4;
|
||||
stroke:#7FC97F;
|
||||
path.stroke.tag-highway-footway {
|
||||
stroke: #996600;
|
||||
}
|
||||
path.casing.tag-highway-trunk,
|
||||
path.casing.tag-highway-trunk_link {
|
||||
stroke:#7FC97F;
|
||||
path.stroke.tag-highway-cycleway {
|
||||
stroke: #69f;
|
||||
}
|
||||
path.stroke.tag-highway-bridleway {
|
||||
stroke: green;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-primary,
|
||||
path.stroke.tag-highway-primary_link {
|
||||
stroke:#ec989a;
|
||||
path.stroke.tag-highway-steps {
|
||||
stroke: #ff6257;
|
||||
stroke-width: 4;
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 3, 3;
|
||||
}
|
||||
path.casing.tag-highway-primary,
|
||||
path.casing.tag-highway-primary_link {
|
||||
stroke:#681212;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-secondary,
|
||||
path.stroke.tag-highway-secondary_link {
|
||||
stroke:#FDBF6F;
|
||||
}
|
||||
path.casing.tag-highway-secondary,
|
||||
path.casing.tag-highway-secondary_link {
|
||||
stroke:#444;
|
||||
path.casing.tag-highway-steps {
|
||||
stroke-width: 6;
|
||||
stroke: #fff;
|
||||
}
|
||||
|
||||
path.casing.tag-bridge-yes {
|
||||
@@ -288,11 +435,108 @@ path.casing.tag-bridge-yes {
|
||||
stroke: #000;
|
||||
}
|
||||
|
||||
path.stroke.tag-highway-construction,
|
||||
path.casing.tag-highway-construction {
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 7, 7;
|
||||
}
|
||||
|
||||
svg[data-zoom="16"] path.stroke.tag-highway-construction,
|
||||
svg[data-zoom="16"] path.casing.tag-highway-construction {
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 5, 5;
|
||||
}
|
||||
|
||||
/* railways */
|
||||
|
||||
path.stroke.tag-railway {
|
||||
stroke: #eee;
|
||||
stroke-width: 2;
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 12,12;
|
||||
}
|
||||
path.casing.tag-railway {
|
||||
stroke: #555;
|
||||
stroke-width: 4;
|
||||
}
|
||||
|
||||
path.stroke.tag-railway-abandoned {
|
||||
stroke: #eee;
|
||||
}
|
||||
path.casing.tag-railway-abandoned {
|
||||
stroke: #999;
|
||||
}
|
||||
|
||||
path.stroke.tag-railway-subway {
|
||||
stroke: #666;
|
||||
}
|
||||
path.casing.tag-railway-subway {
|
||||
stroke: #222;
|
||||
}
|
||||
|
||||
/* waterways */
|
||||
|
||||
path.stroke.tag-waterway {
|
||||
stroke: #10539a;
|
||||
stroke-width: 2;
|
||||
}
|
||||
path.casing.tag-waterway {
|
||||
stroke: #6AA2FF;
|
||||
stroke-width: 4;
|
||||
}
|
||||
|
||||
path.stroke.tag-waterway-river {
|
||||
stroke-width: 4;
|
||||
}
|
||||
path.casing.tag-waterway-river {
|
||||
stroke-width: 6;
|
||||
}
|
||||
|
||||
svg[data-zoom="16"] path.stroke.tag-waterway-river {
|
||||
stroke-width: 4;
|
||||
}
|
||||
svg[data-zoom="16"] path.casing.tag-waterway-river {
|
||||
stroke-width: 6;
|
||||
}
|
||||
|
||||
path.stroke.tag-waterway-ditch {
|
||||
stroke: #10539a;
|
||||
stroke-width: 1;
|
||||
}
|
||||
path.casing.tag-waterway-ditch {
|
||||
stroke: #999692;
|
||||
stroke-width: 3;
|
||||
}
|
||||
|
||||
/* power */
|
||||
|
||||
path.stroke.tag-power {
|
||||
stroke: #939393;
|
||||
stroke-width: 2;
|
||||
}
|
||||
path.casing.tag-power {
|
||||
stroke: none;
|
||||
}
|
||||
|
||||
/* boundary */
|
||||
|
||||
path.stroke.tag-boundary {
|
||||
stroke: #fff;
|
||||
stroke-width: 2;
|
||||
stroke-linecap: butt;
|
||||
stroke-dasharray: 20, 5, 5, 5;
|
||||
}
|
||||
path.casing.tag-boundary {
|
||||
stroke: #82B5FE;
|
||||
stroke-width: 6;
|
||||
}
|
||||
|
||||
path.casing.tag-boundary-protected_area,
|
||||
path.casing.tag-boundary-national_park {
|
||||
stroke: #4D9849;
|
||||
}
|
||||
|
||||
|
||||
text {
|
||||
font-size:10px;
|
||||
pointer-events: none;
|
||||
|
||||
Reference in New Issue
Block a user