Changeset 3902 in josm for trunk/styles_nodist

Timestamp:

2011-02-14T16:13:57+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: minor improvements, fixes #5937 - MapCSS matching of piste:type=downhill, fixes #5938 - matching of relation members

Location:

trunk/styles_nodist/potlatch2

Files:

• README (added)
• build.xml (modified) (2 diffs)
• patched/core_pois.css (modified) (1 diff)
• patched/core_relations.css (added)

trunk/styles_nodist/potlatch2/build.xml

@@ -1 @@
-<project name="potlatch2styles_mod" basedir=".">
-<!--
-
-    The potlatch 2 styles need to be patched in order to work with the JOSM MapCSS implementation.
-    When updating from the potlatch2 repository, the workflow can be like this:
-     * copy files from 'patched' to 'source'
-     * cd source && svn up
-     * solve possible conflicts
-     * modify the new sections, such that they work with josm
-     * create potlatch2.mapcss (ant assemble)
-     * copy files from 'source' to 'patched'
-     * update externals definition to the current revision (ant update-externals)
-     * commit everything (style, patches and externals definition)
-     
--->
+<project name="potlatch2_patch_utils" basedir="." default="assemble">
 
     <!--    concatinate the files to one mapcss style file     -->
@@ -19 +5 @@
         <concat destfile="../../styles/standard/potlatch2.mapcss">
             <filelist dir="." files="prelude.css"/>        
-            <filelist dir="patched" files="core_ways.css,core_pois.css,core_landuse.css,potlatch.css"/>        
+            <filelist dir="patched" files="core_ways.css,core_pois.css,core_landuse.css,core_relations.css,potlatch.css"/>        
         </concat>
     </target>
     
-    
-    <target name="copy-patched-to-source">
-        <copy todir="source" overwrite="true"> 
-            <fileset dir="patched"/>
-        </copy>
-    </target>
-    
-    <target name="copy-source-to-patched">
-        <copy todir="patched" overwrite="true"> 
-            <filelist dir="source" files="core_ways.css,core_pois.css,core_landuse.css,potlatch.css"/>        
-        </copy>
-    </target>
 
-    <!--    Update the explicit revision number in the externals definition to the current revision. -->
+    <!--    update the explicit revision number in the externals definition to the currently checked out revison  -->
     <target name="update-externals" depends="source-revision">
         <exec executable="svn">

trunk/styles_nodist/potlatch2/patched/core_pois.css

@@ -89 +89 @@
 /* Addressing */
 
-node["addr:housenumber"],
-node["addr:housename"] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; }
-node["addr:housenumber"]::hn_casing,
-node["addr:housename"]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
-way["addr:interpolation"] { color: #B0E0E6; width: 3; dashes: 3,3;}
+node[addr:housenumber],
+node[addr:housename] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; }
+node[addr:housenumber]::hn_casing,
+node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}