Skip to content

Commit

Permalink
udpate core library, add lane turn symbols to standard stylesheet
Browse files Browse the repository at this point in the history 
osmscout library changes:

 - add small junction penalty to router, fastest route is more reliable now
 - support for lane turn symbols
  • Loading branch information
@Karry
Karry committed Apr 6, 2020
1 parent 4767f9d commit 0017e6d
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dependencies/libosmscout
Submodule libosmscout updated 25 files
+3 −0 libosmscout-map/include/osmscout/MapPainter.h
+4 −3 libosmscout-map/include/osmscout/StyleConfig.h
+1 −1 libosmscout-map/include/osmscout/StyleDescription.h
+61 −16 libosmscout-map/include/osmscout/Styles.h
+10 −0 libosmscout-map/parser/OSS/OSS.atg
+2 −0 libosmscout-map/parser/generate.sh
+192 −31 libosmscout-map/src/osmscout/MapPainter.cpp
+63 −79 libosmscout-map/src/osmscout/StyleConfig.cpp
+33 −3 libosmscout-map/src/osmscout/Styles.cpp
+6 −0 libosmscout-map/src/osmscout/oss/Parser.cpp
+1 −1 libosmscout/include/osmscout/TypeFeatures.h
+2 −1 libosmscout/include/osmscout/routing/AbstractRoutingService.h
+9 −24 libosmscout/include/osmscout/routing/DBFileOffset.h
+2 −6 libosmscout/include/osmscout/routing/MultiDBRoutingService.h
+85 −24 libosmscout/include/osmscout/routing/RoutingProfile.h
+2 −1 libosmscout/include/osmscout/routing/SimpleRoutingService.h
+1 −1 libosmscout/parser/OST/OST.atg
+2 −0 libosmscout/parser/generate.sh
+1 −6 libosmscout/src/osmscout/TypeFeatures.cpp
+3 −1 libosmscout/src/osmscout/navigation/SpeedAgent.cpp
+2 −2 libosmscout/src/osmscout/ost/Parser.cpp
+22 −2 libosmscout/src/osmscout/routing/AbstractRoutingService.cpp
+4 −7 libosmscout/src/osmscout/routing/MultiDBRoutingService.cpp
+3 −2 libosmscout/src/osmscout/routing/SimpleRoutingService.cpp
+91 −0 stylesheets/standard.oss
2 changes: 2 additions & 0 deletions rpm/harbour-osmscout.changes.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,3 +377,5 @@
- optimise track loading from collection database
- try to release cache when system memory is under pressure
- fix performance issue while displaying active track
- add small junction penalty to router, fastest route is more reliable now
- show lane turn symbols on high zoom levels
90 changes: 90 additions & 0 deletions stylesheets/standard.oss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,9 @@ CONST

COLOR wallColor = #663e1b;

COLOR turnSymbolColor = #ffffff80;
COLOR turnSymbolOutlineColor = #a0a0a080;

SYMBOL viaFerrataEasyCross
POLYGON -0.5,-0.5 0.5,0.5 {
AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
Expand Down Expand Up @@ -557,6 +560,66 @@ CONST
AREA { color: @cliffColor;}
}

SYMBOL turn_forward_left
POLYGON 2.04,1.92 2.65,1.38 2.98,1.57 3.01,0.60 2.04,0.90 2.36,1.14 1.93,1.52 -0.32,1.53 -0.33,1.93 2.04,1.92 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_forward_through_left
POLYGON 1.90,1.87 3.10,1.27 1.90,0.67 1.90,1.07 0.79,1.07 1.18,0.48 1.51,0.67 1.54,-0.30 0.61,0.08 0.90,0.29 0.40,1.07 -0.60,1.07 -0.60,1.47 1.90,1.47 1.90,1.87 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_forward_through
POLYGON 1.90,0.90 3.10,0.30 1.90,-0.30 1.90,0.10 -0.60,0.10 -0.60,0.50 1.90,0.50 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_forward_through_right
POLYGON 1.90,0.30 3.10,0.90 1.90,1.50 1.90,1.10 0.79,1.10 1.18,1.69 1.51,1.50 1.54,2.47 0.61,2.10 0.90,1.88 0.40,1.10 -0.60,1.10 -0.60,0.70 1.90,0.70 1.90,0.30 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_forward_right
POLYGON 2.04,-0.59 2.65,-0.05 2.98,-0.24 3.01,0.73 2.04,0.43 2.36,0.19 1.93,-0.19 -0.32,-0.20 -0.33,-0.60 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_backward_left
POLYGON 1.31,1.92 0.69,1.38 0.36,1.57 0.33,0.60 1.30,0.90 0.98,1.14 1.41,1.52 3.66,1.53 3.67,1.93 1.31,1.92 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_backward_through_left
POLYGON 1.80,1.87 0.60,1.27 1.80,0.67 1.80,1.07 2.91,1.07 2.52,0.48 2.19,0.67 2.16,-0.30 3.09,0.08 2.80,0.29 3.30,1.07 4.30,1.07 4.30,1.47 1.80,1.47 1.80,1.87 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_backward_through
POLYGON 1.80,0.90 0.60,0.30 1.80,-0.30 1.80,0.10 4.30,0.10 4.30,0.50 1.80,0.50 1.80,0.90 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_backward_through_right
POLYGON 1.80,0.30 0.60,0.90 1.80,1.50 1.80,1.10 2.91,1.10 2.52,1.69 2.19,1.50 2.16,2.47 3.09,2.10 2.80,1.88 3.30,1.10 4.30,1.10 4.30,0.70 1.80,0.70 1.80,0.30 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

SYMBOL turn_backward_right
POLYGON 1.31,-0.59 0.69,-0.05 0.36,-0.24 0.33,0.73 1.30,0.43 0.98,0.19 1.41,-0.19 3.66,-0.20 3.67,-0.60 1.31,-0.59 {
AREA { color: @turnSymbolColor; }
AREA.BORDER { width: 0.1mm; color: @turnSymbolOutlineColor; }
}

STYLE
// -------------------------------------------------------
//
Expand Down Expand Up @@ -1383,6 +1446,33 @@ STYLE
highway_tertiary_link] {
WAY#lanes { color: lighten(@tertiaryColor,0.1); displayWidth: 0.4mm; dash: 20,3; priority: 1; joinCap: butt; offsetRel: laneDivider; }
}

// lane turn symbols
[TYPE highway_motorway,
highway_motorway_link,
highway_trunk,
highway_trunk_link,
highway_motorway_trunk,
highway_primary,
highway_primary_link,
highway_motorway_primary,
highway_secondary,
highway_secondary_link,
highway_tertiary,
highway_tertiary_link] {

WAY.SYMBOL#laneForwardLeft { symbol: turn_forward_left; symbolSpace: 10mm; offsetRel: laneForwardLeft; }
WAY.SYMBOL#laneForwardThroughLeft { symbol: turn_forward_through_left; symbolSpace: 10mm; offsetRel: laneForwardThroughLeft; }
WAY.SYMBOL#laneForwardThrough { symbol: turn_forward_through; symbolSpace: 10mm; offsetRel: laneForwardThrough; }
WAY.SYMBOL#laneForwardThroughRight { symbol: turn_forward_through_right; symbolSpace: 10mm; offsetRel: laneForwardThroughRight; }
WAY.SYMBOL#laneForwardRight { symbol: turn_forward_right; symbolSpace: 10mm; offsetRel: laneForwardRight; }
WAY.SYMBOL#laneBackwardLeft { symbol: turn_backward_left; symbolSpace: 10mm; offsetRel: laneBackwardLeft; }
WAY.SYMBOL#laneBackwardThroughLeft { symbol: turn_backward_through_left; symbolSpace: 10mm; offsetRel: laneBackwardThroughLeft; }
WAY.SYMBOL#laneBackwardThrough { symbol: turn_backward_through; symbolSpace: 10mm; offsetRel: laneBackwardThrough; }
WAY.SYMBOL#laneBackwardThroughRight { symbol: turn_backward_through_right; symbolSpace: 10mm; offsetRel: laneBackwardThroughRight; }
WAY.SYMBOL#laneBackwardRight { symbol: turn_backward_right; symbolSpace: 10mm; offsetRel: laneBackwardRight; }

}
}

// -------------------------------------------------------
Expand Down

0 comments on commit 0017e6d

Please sign in to comment.