Mercurial > mxd2map
changeset 112:82a220ac7033
Merged with Stephans commits.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Tue, 14 Jun 2011 12:46:35 +0200 |
| parents | 104af51a4717 (current diff) 01cd6b736acd (diff) |
| children | 0db6eacad0e6 |
| files | ChangeLog |
| diffstat | 6 files changed, 35 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Tue Jun 14 12:33:28 2011 +0200 +++ b/.hgignore Tue Jun 14 12:46:35 2011 +0200 @@ -1,3 +1,4 @@ syntax: regexp ^mapserver/logs/ +^tmp/
--- a/ChangeLog Tue Jun 14 12:33:28 2011 +0200 +++ b/ChangeLog Tue Jun 14 12:46:35 2011 +0200 @@ -3,6 +3,16 @@ * src/java/de/intevation/mxd/ArcGISInitializer.java: Load the arcobjects.jar from ArcGIS install folder. +2011-06-14 Stephan Holl <stephan.holl@intevation.de> + + * mapserver/mapfile/mxd.map: Added ows_enable_request-directive to + allow OGC-services. + +2011-06-14 Stephan Holl <stephan.holl@intevation.de> + + * mxd/connections/SDE/sde_areas.txt: New. Added hints for + cconnecting to ArcSDE. + 2011-06-10 Raimund Renkert <raimund.renkert@intevation.de> * src/java/de/intevation/mxd/ArcGISInitializer.java: @@ -32,61 +42,8 @@ * src/java/de/intevation/mxd/writer/MapScriptWriter.java: Set the class name to the layer name if it is empty. -2011-06-07 Raimund Renkert <raimund.renkert@intevation.de> - - * src/java/de/intevation/mxd/writer/MapScriptWriter.java: - Write the absolute path to the data source of the layer. - -2011-06-06 Raimund Renkert <raimund.renkert@intevation.de> - - Added polygon writer. - - * src/java/de/intevation/mxd/reader/LineFillSymbolReader.java: - Read the angle from the symbol. - - * src/java/de/intevation/mxd/reader/HashLineSymbolReader.java, - src/java/de/intevation/mxd/reader/CartoLineSymbolReader.java, - src/java/de/intevation/mxd/reader/PictureLineSymbolReader.java, - src/java/de/intevation/mxd/reader/SimpleLineSymbolReader.java: - Set type and style for all line symbol reader. - - * src/java/de/intevation/mxd/reader/FeatureLayerReader.java: - Added polygon as layer type. - - * src/java/de/intevation/mxd/writer/SymbolWriter.java: - Added method to write hatch symbols. - - * src/java/de/intevation/mxd/writer/MapScriptWriter.java: - Write the polygon layer. - - * src/java/de/intevation/mxd/writer/FillStyleWriter.java: - New. Writes polygon layer to the mapfile. - -2011-06-01 Raimund Renkert <raimund.renkert@intevation.de> - - * src/java/de/intevation/mxd/Converter.java, - src/java/de/intevation/mxd/reader/CharacterMarkerSymbolReader.java, - src/java/de/intevation/mxd/writer/IWriter.java, - src/java/de/intevation/mxd/writer/MapScriptWriter.java, - src/java/de/intevation/mxd/writer/SymbolWriter.java: - Removed needless imports. - -2011-06-01 Raimund Renkert <raimund.renkert@intevation.de> - - * src/java/de/intevation/mxd/writer/MapScriptWriter.java: - Use the line style writer to write simple lines and marker lines. - - * src/java/de/intevation/mxd/writer/LineStyleWriter.java: - New. Writes line styles to the mapfile. - -2011-06-01 Raimund Renkert <raimund.renkert@intevation.de> - - * src/java/de/intevation/mxd/reader/CharacterMarkerSymbolReader.java: - Read and convert the symbol color and convert to integer. - - * src/java/de/intevation/mxd/writer/SymbolWriter.java: - Set the correct character and font string. Save the symbolset to the - mapfile path. +2011-06-01 Stephan Holl <stephan.holl@intevation.de> + * mapserver/symbols/symbols.sym: added a default hatch-symbol 2011-06-01 Stephan Holl <stephan.holl@intevation.de>
--- a/mapserver/mapfile/mxd.map Tue Jun 14 12:33:28 2011 +0200 +++ b/mapserver/mapfile/mxd.map Tue Jun 14 12:46:35 2011 +0200 @@ -30,6 +30,7 @@ 'ows_keywordlist' 'MXD, STYLES, SYMBOLOGY' 'ows_sld_enabled' 'false' 'ows_http_max_age' '86400' # should 24h in seconds + 'ows_enable_request' '*' 'wms_feature_info_mime_type' 'text/html' 'wms_getmap_formatlist' 'image/png,image/png; mode=24bit' 'wms_encoding' 'UTF-8'
--- a/mapserver/symbols/symbols.sym Tue Jun 14 12:33:28 2011 +0200 +++ b/mapserver/symbols/symbols.sym Tue Jun 14 12:46:35 2011 +0200 @@ -1,28 +1,8 @@ SYMBOLSET -### Styles: point -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/SimpleMarkerSymbol/p_single_4pt_c255-0-0.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/PictureMarkerSymbol/p_pictmarker_11pt_warning.bmp.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_single_18pt_c255-255-255_ttf.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/CharacterMarkerSymbol/p_charmarker_18pt_c255-0-0.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/point/ArrowMarkerSymbol/p_arrowmarker_0-0-0_12-0.sym" -### Styles: line -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dott-dott_1pt_c255-255-255.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dash-dotted_1pt_c255-255-255.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dashed_1pt_c255-255-255.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_dotted_1pt_c255-255-255.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/SimpleLineSymbol/l_solid_1pt_c255-255-255.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/PictureLineSymbol/l_pictureline_brick1_1_1_1-0-0-0.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/CartographicLineSymbol/l_cartoline_04pt_c255-255-255_butt-round_template_multilayer.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/line/MarkerLineSymbol/l_markerline_18pt_0-0-0_raute.sym" -### Styles: polygon -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_255-0-0.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/SimpleFillSymbol/pol_simple_transp_dashed-outline.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/PictureFillSymbol/pol_single_04pt_109-187-67_0-1-1_Grassland.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/MarkerFillSymbol/pol_marker_fill_0-0-0_1.sym" -##INCLUDE "/home/intevation/mxd-testbed/mxd/Styles/polygon/LineFillSymbol/pol_linefill_255-0-0_45_outline.sym" -##END + # basic symbol for hatching in all variantes which + # will be combined inside the STYLE-block + SYMBOL + NAME "hatch" + TYPE hatch + END +END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mxd/connections/SDE/sde_areas.txt Tue Jun 14 12:46:35 2011 +0200 @@ -0,0 +1,13 @@ +SDE:server,instanz,db,user,pw,table table +ogrinfo -al -so SDE:pluto,5152,SGE.SGEFeatures,gast,gast,SGE.SGEAreas \ +SGE.AREAS + +LAYER + ... + CONNECTIONTYPE PLUGIN + CONNECTION "hostname,port:xxx,database,username,password" + PLUGIN "C:/ms_6.1-dev/bin/msplugin_sde_93.dll" + DATA "layername,geometrycolumn,SDE.DEFAULT" + ... +END # layer +
--- a/properties.xml Tue Jun 14 12:33:28 2011 +0200 +++ b/properties.xml Tue Jun 14 12:46:35 2011 +0200 @@ -19,7 +19,7 @@ <property name="root.dir" location="${basedir}"/> <basename property="sample.dir" file="${basedir}" /> <property name="src.dir" location="src"/> -<property name="build.dir" location="c:\tmp\build"/> +<property name="build.dir" location="c:\tmp\build_sh"/> <property name="class.dir" location="${build.dir}/classes"/> <property name="dist.dir" location="${build.dir}/dist"/> <property name="libs.dir" location="lib"/>