Update readme.

This commit is contained in:
Sergey Vartanov 2021-12-12 09:58:30 +03:00
parent 248042090b
commit 0a61a6e17e
3 changed files with 16 additions and 8 deletions

View file

@ -69,7 +69,7 @@ Visualization of tree leaf types (broadleaved or needle-leaved) and genus or tax
### Viewpoint and camera direction ###
Visualize [`direction`](https://wiki.openstreetmap.org/wiki/Key:direction) tag for [`tourism`](https://wiki.openstreetmap.org/wiki/Key:tourism)=[`viewpoint`](https://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint) and [`camera:direction`](https://wiki.openstreetmap.org/wiki/Key:camera:direction) for [`man_made`](https://wiki.openstreetmap.org/wiki/Key:man_made)=[`surveillance`](https://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance).
[`direction`](https://wiki.openstreetmap.org/wiki/Key:direction) tag values for [`tourism`](https://wiki.openstreetmap.org/wiki/Key:tourism) = [`viewpoint`](https://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint) and [`camera:direction`](https://wiki.openstreetmap.org/wiki/Key:camera:direction) for [`man_made`](https://wiki.openstreetmap.org/wiki/Key:man_made) = [`surveillance`](https://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance) are rendered with sectors displaying the direction and angle (15º if angle is not specified) or the whole circle for panorama view. Radial gradient is used for surveillance and inverted radial gradient is used for viewpoints.
![Surveillance](doc/surveillance.svg)
@ -77,7 +77,7 @@ Visualize [`direction`](https://wiki.openstreetmap.org/wiki/Key:direction) tag f
### Power tower design ###
Visualize [`design`](https://wiki.openstreetmap.org/wiki/Key:design) values used with [`power`](https://wiki.openstreetmap.org/wiki/Key:power)=[`tower`](https://wiki.openstreetmap.org/wiki/Tag:power=tower) tag.
Visualize [`design`](https://wiki.openstreetmap.org/wiki/Key:design) values used with [`power`](https://wiki.openstreetmap.org/wiki/Key:power) = [`tower`](https://wiki.openstreetmap.org/wiki/Tag:power=tower) tag.
![Power tower design](doc/icons_power.svg)
@ -103,11 +103,15 @@ Japanese maps usually use [special symbols](https://en.wikipedia.org/wiki/List_o
Map Machine constructs icons from the shapes extracted from the sketch SVG file. Some icons consist of just one shape, to construct others it may be necessary to combine two or more shapes.
### Masts ###
#### Masts ####
For [`man_made`](https://wiki.openstreetmap.org/wiki/Key:man_made) = [`mast`](https://wiki.openstreetmap.org/wiki/Tag:man_made=mast) distinguish types (communication, lignting, monitoring, and siren) and construction (freestanding or lattice, and using of guys) are rendered by combining 7 unique icon shapes.
![Mast types](doc/mast.svg)
### Volcanoes ###
#### Volcanoes ####
For [`natural`](https://wiki.openstreetmap.org/wiki/Key:natural) = [`volcano`](https://wiki.openstreetmap.org/wiki/Tag:natural=volcano) status (active, dormant, extinct, or unspecified) and type (stratovolcano, shield, or scorial) are rendered by combining 7 unique icon shapes.
![Volcano types](doc/volcano.svg)

View file

@ -82,7 +82,7 @@ Visualization of tree \icon {tree} leaf types (broadleaved \icon {tree_with_leaf
\3 {Viewpoint and camera direction} {viewpoint-and-camera-direction}
Visualize \osm {direction} tag for \osm {tourism=viewpoint} and \osm {camera:direction} for \osm {man_made=surveillance}.
\osm {direction} tag values for \osm {tourism=viewpoint} and \osm {camera:direction} for \osm {man_made=surveillance} are rendered with sectors displaying the direction and angle (15º if angle is not specified) or the whole circle for panorama view. Radial gradient is used for surveillance and inverted radial gradient is used for viewpoints.
\image {doc/surveillance.svg} {Surveillance}
@ -116,11 +116,15 @@ Japanese maps usually use \ref {https://en.wikipedia.org/wiki/List_of_Japanese_m
Map Machine constructs icons from the shapes extracted from the sketch SVG file. Some icons consist of just one shape, to construct others it may be necessary to combine two or more shapes.
\3 {Masts} {masts}
\4 {Masts} {masts}
For \osm {man_made=mast} distinguish types (communication, lignting, monitoring, and siren) and construction (freestanding or lattice, and using of guys) are rendered by combining 7 unique icon shapes.
\image {doc/mast.svg} {Mast types}
\3 {Volcanoes} {volcanoes}
\4 {Volcanoes} {volcanoes}
For \osm {natural=volcano} status (active, dormant, extinct, or unspecified) and type (stratovolcano, shield, or scorial) are rendered by combining 7 unique icon shapes.
\image {doc/volcano.svg} {Volcano types}

View file

@ -123,7 +123,7 @@ class MapMachineMoire(Default, ABC):
key, tag = spec.split("=")
return (
self.get_ref_(f"{PREFIX}Key:{key}", self.m([key]))
+ "="
+ " = "
+ self.get_ref_(f"{PREFIX}Tag:{key}={tag}", self.m([tag]))
)