Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge thins from extraction UI branch

Browse source
This commit is contained in:
Victor Shcherb 2012-10-26 19:13:57 +02:00
parent eca5fcc7a0
commit b57c476951
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
DataExtractionOSM/src/net/osmand/render/default.render.xml
View file

@ -32,7 +32,7 @@
<!-- next line corrects for shadowColor appearing very dark with solid shadow in day view --> <!-- next line corrects for shadowColor appearing very dark with solid shadow in day view -->
<filter minzoom="14" nightMode="false" attrIntValue="3" shadowColor="#969696"/> <filter minzoom="14" nightMode="false" attrIntValue="3" shadowColor="#969696"/>
<filter minzoom="14" attrIntValue="3" shadowColor="#464646"/> <filter minzoom="14" attrIntValue="3" shadowColor="#464646"/>
<filter minzoom="9" maxzoom="13" attrIntValue="1" shadowColor="#464646"/> <filter minzoom="9" maxzoom="13" attrIntValue="3" shadowColor="#464646"/>
<filter attrIntValue="0"/> <filter attrIntValue="0"/>
</renderingAttribute> </renderingAttribute>
@ -312,47 +312,46 @@
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom], textLength, ref, textOrder (default=100) --> <!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom], textLength, ref, textOrder (default=100) -->
<text> <text>
<!-- Highway refs --> <!-- Highway refs -->
<filter minzoom="10" tag="highway" value="motorway" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="7"> <filter minzoom="8" tag="highway" value="motorway" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="7">
<filter textLength="1" textShield="mot_shield1"/> <filter textLength="1" textShield="mot_shield1"/>
<filter textLength="2" textShield="mot_shield2"/> <filter textLength="2" textShield="mot_shield2"/>
<filter textLength="3" textShield="mot_shield3"/> <filter textLength="3" textShield="mot_shield3"/>
<filter textLength="4" textShield="mot_shield4"/> <filter textLength="4" textShield="mot_shield4"/>
<filter textLength="5" textShield="mot_shield5"/> <filter textLength="5" textShield="mot_shield5"/>
<filter textLength="6" textShield="mot_shield6"/> <filter textShield="mot_shield6"/>
</filter> </filter>
<filter minzoom="10" tag="highway" value="trunk" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="7"> <filter minzoom="8" tag="highway" value="trunk" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="7">
<filter textLength="1" textShield="tru_shield1"/> <filter textLength="1" textShield="tru_shield1"/>
<filter textLength="2" textShield="tru_shield2"/> <filter textLength="2" textShield="tru_shield2"/>
<filter textLength="3" textShield="tru_shield3"/> <filter textLength="3" textShield="tru_shield3"/>
<filter textLength="4" textShield="tru_shield4"/> <filter textLength="4" textShield="tru_shield4"/>
<filter textLength="5" textShield="tru_shield5"/> <filter textLength="5" textShield="tru_shield5"/>
<filter textLength="6" textShield="tru_shield6"/> <filter textShield="tru_shield6"/>
</filter> </filter>
<filter minzoom="11" tag="highway" value="primary" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="8"> <filter minzoom="10" tag="highway" value="primary" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="8">
<filter textLength="1" textShield="pri_shield1"/> <filter textLength="1" textShield="pri_shield1"/>
<filter textLength="2" textShield="pri_shield2"/> <filter textLength="2" textShield="pri_shield2"/>
<filter textLength="3" textShield="pri_shield3"/> <filter textLength="3" textShield="pri_shield3"/>
<filter textLength="4" textShield="pri_shield4"/> <filter textLength="4" textShield="pri_shield4"/>
<filter textLength="5" textShield="pri_shield5"/> <filter textLength="5" textShield="pri_shield5"/>
<filter textLength="6" textShield="pri_shield6"/> <filter textShield="pri_shield6"/>
</filter> </filter>
<filter minzoom="13" tag="highway" value="secondary" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="9"> <filter minzoom="12" tag="highway" value="secondary" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="9">
<filter textLength="1" textShield="sec_shield1"/> <filter textLength="1" textShield="sec_shield1"/>
<filter textLength="2" textShield="sec_shield2"/> <filter textLength="2" textShield="sec_shield2"/>
<filter textLength="3" textShield="sec_shield3"/> <filter textLength="3" textShield="sec_shield3"/>
<filter textLength="4" textShield="sec_shield4"/> <filter textLength="4" textShield="sec_shield4"/>
<filter textLength="5" textShield="sec_shield5"/> <filter textLength="5" textShield="sec_shield5"/>
<filter textLength="6" textShield="sec_shield6"/> <filter textShield="sec_shield6"/>
</filter> </filter>
<filter minzoom="14" tag="highway" value="tertiary" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="10"> <filter minzoom="13" tag="highway" value="tertiary" nameTag="ref" textMinDistance="150" textColor="#ffffff" textSize="12" textBold="true" textOrder="10">
<filter textLength="1" textShield="ter_shield1"/> <filter textLength="1" textShield="ter_shield1"/>
<filter textLength="2" textShield="ter_shield2"/> <filter textLength="2" textShield="ter_shield2"/>
<filter textLength="3" textShield="ter_shield3"/> <filter textLength="3" textShield="ter_shield3"/>
<filter textLength="4" textShield="ter_shield4"/> <filter textLength="4" textShield="ter_shield4"/>
<filter textLength="5" textShield="ter_shield5"/> <filter textLength="5" textShield="ter_shield5"/>
<filter textLength="6" textShield="ter_shield6"/> <filter textShield="ter_shield6"/>
</filter> </filter>
<!-- Highway text --> <!-- Highway text -->
<group> <group>
<filter tag="highway" value="motorway" nameTag="" textOrder="6"/> <filter tag="highway" value="motorway" nameTag="" textOrder="6"/>
@ -1074,7 +1073,7 @@
<filter tag="highway" value="motorway_link" maxzoom="13" color="$motorwayRoadColor"/> <filter tag="highway" value="motorway_link" maxzoom="13" color="$motorwayRoadColor"/>
<filter tag="highway" value="trunk" maxzoom="13" color="$trunkRoadColor"/> <filter tag="highway" value="trunk" maxzoom="13" color="$trunkRoadColor"/>
<filter tag="highway" value="trunk_link" maxzoom="13" color="$trunkRoadColor"/> <filter tag="highway" value="trunk_link" maxzoom="13" color="$trunkRoadColor"/>
<groupFilter cap="ROUND"> <groupFilter cap="ROUND" shadowRadius="1">
<filter minzoom="5" maxzoom="9" strokeWidth="5"/> <filter minzoom="5" maxzoom="9" strokeWidth="5"/>
<filter minzoom="10" maxzoom="10" strokeWidth="6"/> <filter minzoom="10" maxzoom="10" strokeWidth="6"/>
<filter minzoom="11" maxzoom="11" strokeWidth="7"/> <filter minzoom="11" maxzoom="11" strokeWidth="7"/>
@ -1086,7 +1085,7 @@
<group> <group>
<filter tag="highway" value="primary" maxzoom="13" color="$primaryRoadColor"/> <filter tag="highway" value="primary" maxzoom="13" color="$primaryRoadColor"/>
<filter tag="highway" value="primary_link" maxzoom="13" color="$primaryRoadColor"/> <filter tag="highway" value="primary_link" maxzoom="13" color="$primaryRoadColor"/>
<groupFilter cap="ROUND"> <groupFilter cap="ROUND" shadowRadius="1">
<filter minzoom="7" maxzoom="9" strokeWidth="4"/> <filter minzoom="7" maxzoom="9" strokeWidth="4"/>
<filter minzoom="10" maxzoom="10" strokeWidth="5"/> <filter minzoom="10" maxzoom="10" strokeWidth="5"/>
<filter minzoom="11" maxzoom="11" strokeWidth="6"/> <filter minzoom="11" maxzoom="11" strokeWidth="6"/>
@ -1099,7 +1098,8 @@
<filter tag="highway" value="secondary" maxzoom="13" color="$secondaryRoadColor"/> <filter tag="highway" value="secondary" maxzoom="13" color="$secondaryRoadColor"/>
<filter tag="highway" value="secondary_link" maxzoom="13" color="$secondaryRoadColor"/> <filter tag="highway" value="secondary_link" maxzoom="13" color="$secondaryRoadColor"/>
<groupFilter shadowRadius="1" cap="ROUND"> <groupFilter shadowRadius="1" cap="ROUND">
<filter minzoom="9" maxzoom="9" strokeWidth="3"/> <!-- too much in europe ? -->
<!-- <filter minzoom="9" maxzoom="9" strokeWidth="3"/> -->
<filter minzoom="10" maxzoom="10" strokeWidth="4"/> <filter minzoom="10" maxzoom="10" strokeWidth="4"/>
<filter minzoom="11" maxzoom="11" strokeWidth="5"/> <filter minzoom="11" maxzoom="11" strokeWidth="5"/>
<filter minzoom="12" maxzoom="12" strokeWidth="6"/> <filter minzoom="12" maxzoom="12" strokeWidth="6"/>
@ -1142,7 +1142,8 @@
<filter tag="highway" value="tertiary" color="$tertiaryRoadColor"/> <filter tag="highway" value="tertiary" color="$tertiaryRoadColor"/>
<filter tag="highway" value="tertiary_link" color="$tertiaryRoadColor"/> <filter tag="highway" value="tertiary_link" color="$tertiaryRoadColor"/>
<groupFilter shadowRadius="1" cap="ROUND"> <groupFilter shadowRadius="1" cap="ROUND">
<filter minzoom="10" maxzoom="10" strokeWidth="3"/> <!-- too much in europe ? -->
<!-- <filter minzoom="10" maxzoom="10" strokeWidth="3"/> -->
<filter minzoom="11" maxzoom="11" strokeWidth="4"/> <filter minzoom="11" maxzoom="11" strokeWidth="4"/>
<filter minzoom="12" maxzoom="12" strokeWidth="5"/> <filter minzoom="12" maxzoom="12" strokeWidth="5"/>
<filter minzoom="13" maxzoom="13" strokeWidth="6"/> <filter minzoom="13" maxzoom="13" strokeWidth="6"/>

8
Osmand-kernel/Makefile.vars
View file

@ -115,7 +115,7 @@ $(error Set JAVA_HOME environment variable)
STATICLIB_EXT := a STATICLIB_EXT := a
DYNAMICLIB_EXT := so DYNAMICLIB_EXT := so
LIBRARY_PREFIX := lib LIBRARY_PREFIX := lib
DYNAMICLIB_FLAGS := -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new DYNAMICLIB_FLAGS := -shared -Wl,--dynamic-list-cpp-new
CFLAGS += # empty CFLAGS += # empty
CXXFLAGS += -std=gnu++0x CXXFLAGS += -std=gnu++0x
endif endif
@ -141,9 +141,9 @@ endif
# Modify compiler flags # Modify compiler flags
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
CFLAGS += -m32 CFLAGS += -m32 -fPIC
CXXFLAGS += -m32 CXXFLAGS += -m32 -fPIC
LDFLAGS += -m32 LDFLAGS += -m32 -fPIC
else ifeq ($(ARCH),x86_64) else ifeq ($(ARCH),x86_64)
CFLAGS += -m64 -fPIC CFLAGS += -m64 -fPIC
CXXFLAGS += -m64 -fPIC CXXFLAGS += -m64 -fPIC