projects / potlatch2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bec5222)
add 'split' to toolbox
authorRichard Fairhurst <richard@systemed.net>
Sat, 1 May 2010 09:25:34 +0000 (09:25 +0000)
committerRichard Fairhurst <richard@systemed.net>
Sat, 1 May 2010 09:25:34 +0000 (09:25 +0000)
TODO.txt patch | blob | history
embedded/cut.svg [new file with mode: 0644] patch | blob
net/systemeD/potlatch2/Toolbox.as patch | blob | history
potlatch2.mxml patch | blob | history

diff --git a/TODO.txt b/TODO.txt
index 3025e7c3b921d1112fca987a78353afa367c8e5d..1877fb93f9c80ccb9b738d83ef55930a3d30e34d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -14,7 +14,7 @@ Potlatch 2: main outstanding issues
 
 == Core geometry ==
 
-* Undo/redo
+* Undo/redo: split, draw
 * Deleting a way with junction nodes doesn't redraw them
 
 
@@ -29,15 +29,12 @@ Potlatch 2: main outstanding issues
 
 * Non-900913 projections
 * Plugin support
+* Ability to specify that a node should e a point in a way, for example for crossings
 
 
-== UI ==
+== Tag editing ==
 
-* Keyboard shortcuts
-* Mouse wheel zooming
-* CSS editing
 * Direct click-to-edit of relation role should actually work
-* Toolbox fixes (see comments in file)
 * Dynamic reloading of stylesheet/map_features, so that you don't need to reload the full page when editing them
 * If a select name is too long then, the select menu seems to give a horizontal scrollbar instead of the name of the item e.g. cuisine#Coffee Shop
 * If you have both inputSets names and buildingAddress, and name= key is filled in then the basic tab will get both, surely only name should be shown and building name should be ignored e.g. cafes. [Actually this was an issue of addr: being missing from one of them, however this may still be a problem for other overlapping inputSets]
@@ -46,10 +43,19 @@ Potlatch 2: main outstanding issues
 * Bug where the wrong feature is used, when an item that is dragged from the list when an POI has no icon.
 * Checkboxes, for example what you can recycle, or whether something is a bridge or tunnel
 
-== Tagging ==
+
+== UI ==
+
+* Keyboard shortcuts
+* Mouse wheel zooming
+* CSS editing
+* Toolbox fixes (see comments in file)
+
+
+== Miscellaneous data model ==
 
 * Remove created_by=* tags from any data touched
-* Ability to specify that a node should e a point in a way, for example for crossings
+
 
 == Rendering (Halcyon) ==
 
diff --git a/embedded/cut.svg b/embedded/cut.svg
new file mode 100644 (file)
index 0000000..ac49f0f
--- /dev/null
+++ b/embedded/cut.svg
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 11 Build 196, SVG Export Plug-In . SVG Version: 6.0.0 Build 78)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"    "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+       <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+       <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg 
+        xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;" i:viewOrigin="292.4902 429.9302" i:rulerOrigin="0 0" i:pageBounds="0 841.8896 595.2754 0"
+        xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+        width="11.245" height="18.992" viewBox="0 0 11.245 18.992" overflow="visible" enable-background="new 0 0 11.245 18.992"
+        xml:space="preserve">
+       <metadata>
+               <x:xmpmeta  x:xmptk="XMP toolkit 3.0-29, framework 1.6" xmlns:x="adobe:ns:meta/">
+                       <rdf:RDF  xmlns:iX="http://ns.adobe.com/iX/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                               <rdf:Description  rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/"></rdf:Description>
+                               <rdf:Description  rdf:about="" xmlns:tiff="http://ns.adobe.com/tiff/1.0/"></rdf:Description>
+                               <rdf:Description  rdf:about="" xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/" xmlns:xap="http://ns.adobe.com/xap/1.0/">
+                                       <xap:CreateDate>2010-03-26T13:12:37Z</xap:CreateDate>
+                                       <xap:ModifyDate>2010-03-26T13:12:37Z</xap:ModifyDate>
+                                       <xap:CreatorTool>Illustrator</xap:CreatorTool>
+                                       <xap:Thumbnails>
+                                               <rdf:Alt>
+                                                       <rdf:li  rdf:parseType="Resource">
+                                                               <xapGImg:format>JPEG</xapGImg:format>
+                                                               <xapGImg:width>196</xapGImg:width>
+                                                               <xapGImg:height>256</xapGImg:height>
+                                                               <xapGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA
+AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK
+DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f
+Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADEAwER
+AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA
+AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB
+UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE
+1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ
+qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy
+obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp
+0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo
++DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXzf+
+Y354foX/AJyQ8vaUlxw0PSY/0drFD8Bk1PgzsxHaGkLeIKsMVfSGKuxV2KuxV2KuxV2KuxV2KviH
+zh/zk/8AnHpvm3W9OtNWhS0sr+6t7dDaWzERxTMiCpSpoq98VSj/AKGv/O3/AKvEH/SHbf8AVPFX
+f9DX/nb/ANXiD/pDtv8Aqnir2v8A5xf/ADj8++fde1uz8zXsd1BZWsc1uqQRQkO0nEmsarXbxxV9
+FYq7FXYq7FXYq7FXYq7FXYq7FUp82eZLHyz5Z1PX780tdMt5LiQdC3Baqg/ynaij3OKvzP1zWL7W
+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
+Qjxkcsx+eKp3irsVdirsVdirsVf/2Q==
+                                                                       </xapGImg:image>
+                                                       </rdf:li>
+                                               </rdf:Alt>
+                                       </xap:Thumbnails>
+                               </rdf:Description>
+                               <rdf:Description  rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+                                       <dc:format>image/svg+xml</dc:format>
+                               </rdf:Description>
+                       </rdf:RDF>
+               </x:xmpmeta>
+               <variableSets  xmlns="&ns_vars;">
+                       <variableSet  varSetName="binding1" locked="none">
+                               <variables></variables>
+                               <v:sampleDataSets  xmlns="&ns_custom;" xmlns:v="&ns_vars;"></v:sampleDataSets>
+                       </variableSet>
+               </variableSets>
+               <sfw  xmlns="&ns_sfw;">
+                       <slices></slices>
+                       <sliceSourceBounds  y="410.938" x="292.49" width="11.245" height="18.992" bottomLeftOrigin="true"></sliceSourceBounds>
+               </sfw>
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?><x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 3.0-29, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+
+ <rdf:Description rdf:about=''
+  xmlns:pdf='http://ns.adobe.com/pdf/1.3/'>
+ </rdf:Description>
+
+ <rdf:Description rdf:about=''
+  xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
+ </rdf:Description>
+
+ <rdf:Description rdf:about=''
+  xmlns:xap='http://ns.adobe.com/xap/1.0/'
+  xmlns:xapGImg='http://ns.adobe.com/xap/1.0/g/img/'>
+  <xap:CreateDate>2010-03-26T13:12:37Z</xap:CreateDate>
+  <xap:ModifyDate>2010-05-01T08:24:42Z</xap:ModifyDate>
+  <xap:CreatorTool>Illustrator</xap:CreatorTool>
+  <xap:Thumbnails>
+   <rdf:Alt>
+    <rdf:li rdf:parseType='Resource'>
+     <xapGImg:format>JPEG</xapGImg:format>
+     <xapGImg:width>152</xapGImg:width>
+     <xapGImg:height>256</xapGImg:height>
+     <xapGImg:image>/9j/4AAQSkZJRgABAgEAyADIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAAyAAAAAEA&#xA;AQDIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAACYAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q8F/Of/nKfRfJ9zPo&#xA;XleKLWfMEVUuZ3YmztZAaFG4ENK47qrADu1ajFXyz5q/Ob8z/NMjnV/MV48Dk/6HBIba3p2How+m&#xA;hp4sCffFWGu7u7O7FnYksxNSSepJxVO/Lvnrzn5bmSXQtbvdOKGoSCZ1jPs0deDD2YYq+lvyb/5y&#xA;5+u3UGh/mGYoJJSEg8wRqI4yx2Auo1HFKn/diUUdwBVsVfUAIIqNwehxVvFXYq7FXYq7FVskkcUb&#xA;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&#xA;uR1Z2JY/htiqd4q7FXYq/wD/2Q==</xapGImg:image>
+    </rdf:li>
+   </rdf:Alt>
+  </xap:Thumbnails>
+ </rdf:Description>
+
+ <rdf:Description rdf:about=''
+  xmlns:dc='http://purl.org/dc/elements/1.1/'>
+  <dc:format>image/svg+xml</dc:format>
+ </rdf:Description>
+
+</rdf:RDF>
+</x:xmpmeta>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <?xpacket end='w'?>
+                       </metadata>
+               <g id="Layer_1" i:knockout="Off" i:layer="yes" i:dimmedPercent="50" i:rgbTrio="#4F008000FFFF">
+                       <g i:knockout="Off">
+                               <path i:knockout="Off" d="M2.63,18.992c-0.302-0.324-0.521-0.646-0.659-0.967c-0.139-0.32-0.206-0.67-0.206-1.049
+                                       c0-0.551,0.223-1.518,0.67-2.9c0.444-1.383,1.171-3.336,2.174-5.868c-0.38-0.881-0.662-1.784-0.845-2.709
+                                       C3.579,4.574,3.447,4.111,3.364,4.111c-0.027,0-0.048,0.002-0.062,0.005C3.288,4.12,3.278,4.125,3.271,4.133
+                                       C3.037,4.256,2.817,4.348,2.611,4.405c-0.207,0.06-0.41,0.089-0.608,0.089c-0.571,0-1.047-0.213-1.429-0.638
+                                       C0.19,3.432,0,2.896,0,2.247c0-0.663,0.203-1.202,0.609-1.62C1.014,0.209,1.538,0,2.178,0c0.675,0,1.191,0.265,1.554,0.792
+                                       C4.091,1.317,4.272,2.078,4.272,3.07v0.838c0,0.925,0.1,1.591,0.302,2.001c0.2,0.409,0.551,0.697,1.054,0.863
+                                       C6.12,6.614,6.469,6.326,6.671,5.909c0.2-0.417,0.302-1.085,0.302-2.001V3.07c0-0.992,0.18-1.753,0.541-2.278
+                                       C7.871,0.265,8.388,0,9.063,0c0.641,0,1.164,0.209,1.57,0.627c0.407,0.418,0.611,0.957,0.611,1.62
+                                       c0,0.648-0.191,1.185-0.573,1.609c-0.383,0.425-0.861,0.638-1.434,0.638c-0.199,0-0.402-0.029-0.609-0.089
+                                       C8.422,4.348,8.202,4.256,7.967,4.133C7.953,4.125,7.94,4.12,7.927,4.116C7.911,4.113,7.898,4.111,7.885,4.111
+                                       c-0.091,0-0.226,0.463-0.406,1.388C7.295,6.424,7.017,7.327,6.637,8.208c1.031,2.62,1.764,4.6,2.195,5.942
+                                       c0.435,1.34,0.65,2.281,0.65,2.826c0,0.371-0.07,0.723-0.206,1.049c-0.138,0.328-0.358,0.648-0.66,0.967l-2.988-8.055
+                                       L2.63,18.992z M2.125,3.806c0.419,0,0.763-0.139,1.029-0.415C3.423,3.114,3.556,2.76,3.556,2.324
+                                       c0-0.468-0.139-0.859-0.422-1.17c-0.281-0.311-0.632-0.465-1.05-0.465c-0.42,0-0.762,0.145-1.025,0.43
+                                       c-0.265,0.285-0.396,0.66-0.396,1.123c0,0.447,0.14,0.82,0.418,1.117C1.357,3.655,1.706,3.806,2.125,3.806z M9.117,3.806
+                                       c0.417,0,0.766-0.15,1.045-0.446c0.282-0.297,0.423-0.67,0.423-1.117c0-0.463-0.134-0.838-0.401-1.123
+                                       c-0.267-0.285-0.607-0.43-1.024-0.43c-0.438,0-0.796,0.152-1.075,0.455c-0.281,0.303-0.422,0.696-0.422,1.18
+                                       c0,0.441,0.137,0.799,0.405,1.072C8.34,3.668,8.687,3.806,9.117,3.806z"/>
+                       </g>
+               </g>
+       </svg>
diff --git a/net/systemeD/potlatch2/Toolbox.as b/net/systemeD/potlatch2/Toolbox.as
index 485c71694273fe4e8a886a1ff7dfb51fd38d658f..94232bdf406b2e9cb09f3a61b9f9db603343057b 100644 (file)
--- a/net/systemeD/potlatch2/Toolbox.as
+++ b/net/systemeD/potlatch2/Toolbox.as
@@ -15,7 +15,6 @@ package net.systemeD.potlatch2 {
                ** Should be automatically positioned at bottom-right of canvas on init
                ** Should float above tagViewer, not beneath it
                ** Icons should be disabled depending on what's selected (setEntity can do this)
-               ** Straighten, circularise, reverse way direction, parallelise
                ** Remove annoying Illustrator cruft from SVG icons!
 
        */
@@ -88,6 +87,12 @@ package net.systemeD.potlatch2 {
                                Circularise.circularise(Way(entity),controller.map);
                        }
                }
+               
+               public function doSplit():void {
+                       if (entity is Node && controller.state is SelectedWayNode) {
+                               controller.setState(SelectedWayNode(controller.state).splitWay());
+                       }
+               }
 
        }
 }
diff --git a/potlatch2.mxml b/potlatch2.mxml
index 78995cdec5f5c29e6045efc904472e79f5f2b14f..d5df2a1b3660d94522b6fb4e17ad5479a86919af 100755 (executable)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -56,7 +56,7 @@
             showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
 
                <potlatch2:Toolbox id="toolbox" 
-                       height="46" width="217" 
+                       height="46" width="253" 
                        headerHeight="6" headerColors="[black, gray]" 
                        borderThicknessRight="0" borderThicknessLeft="0" borderThicknessBottom="0" 
                        paddingLeft="4" paddingTop="4" layout="horizontal"
@@ -68,6 +68,9 @@
                <mx:Button icon="@Embed('embedded/direction.svg')" 
                 click='toolbox.doReverseDirection();'
                                width="28" height="28" textAlign="left" paddingLeft="8" paddingRight="0" />
+               <mx:Button icon="@Embed('embedded/cut.svg')" 
+                click='toolbox.doSplit();'
+                               width="28" height="28" textAlign="left" paddingLeft="8" paddingRight="0" />
                <mx:Button icon="@Embed('embedded/straighten.svg')" 
                                click='toolbox.doStraighten();' 
                                width="28" height="28" textAlign="left" paddingLeft="5" paddingRight="0" />
Potlatch 2