Skip to content

蒋波涛 / tianditudownloader

Go to a project
Toggle navigation
Toggle navigation pinning
82332cac by chiangbt
Options

update 3.27

1 parent 05db60ef
Inline Side-by-side
Showing 11 changed files with 175 additions and 103 deletions
...@@ -2,9 +2,17 @@ ...@@ -2,9 +2,17 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="5b5a29d8-78e9-4a9f-a415-1e11442b5ca7" name="Default" comment=""> 4 <list default="true" id="5b5a29d8-78e9-4a9f-a415-1e11442b5ca7" name="Default" comment="">
5 <change type="DELETED" beforePath="$PROJECT_DIR$/my.db" afterPath="" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/Main.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/Main.class" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/TiandituDownload.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/TiandituDownload.class" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/TDTUrl$1.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/TDTUrl$1.class" />
9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/TDTUrl.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/TDTUrl.class" />
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/TianDiTuTiledMapServiceType.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/TianDiTuTiledMapServiceType.class" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" /> 12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/TiandituDownload.java" afterPath="$PROJECT_DIR$/src/TiandituDownload.java" /> 13 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/TiandituDownload.java" afterPath="$PROJECT_DIR$/src/TiandituDownload.java" />
14 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils/TDTUrl.java" afterPath="$PROJECT_DIR$/src/utils/TDTUrl.java" />
15 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java" afterPath="$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java" />
8 </list> 16 </list>
9 <ignored path="$PROJECT_DIR$/out/" /> 17 <ignored path="$PROJECT_DIR$/out/" />
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 18 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -16,33 +24,58 @@ ...@@ -16,33 +24,58 @@
16 </component> 24 </component>
17 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
18 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
19 <file leaf-file-name="Main.java" pinned="false" current-in-tab="true"> 27 <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
20 <entry file="file://$PROJECT_DIR$/src/Main.java"> 28 <entry file="file://$PROJECT_DIR$/src/Main.java">
21 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
22 <state relative-caret-position="45"> 30 <state relative-caret-position="135">
23 <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> 31 <caret line="9" column="55" lean-forward="false" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
32 <folding>
33 <element signature="imports" expanded="true" />
34 </folding>
35 </state>
36 </provider>
37 </entry>
38 </file>
39 <file leaf-file-name="readme.md" pinned="false" current-in-tab="false">
40 <entry file="file://$PROJECT_DIR$/readme.md">
41 <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
42 <state split_layout="SPLIT">
43 <first_editor relative-caret-position="255">
44 <caret line="17" column="3" lean-forward="false" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
24 <folding /> 45 <folding />
46 </first_editor>
47 <second_editor />
25 </state> 48 </state>
26 </provider> 49 </provider>
27 </entry> 50 </entry>
28 </file> 51 </file>
29 <file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="false"> 52 <file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="true">
30 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 53 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
31 <provider selected="true" editor-type-id="text-editor"> 54 <provider selected="true" editor-type-id="text-editor">
32 <state relative-caret-position="235"> 55 <state relative-caret-position="79">
33 <caret line="143" column="5" lean-forward="true" selection-start-line="143" selection-start-column="5" selection-end-line="143" selection-end-column="5" /> 56 <caret line="171" column="81" lean-forward="true" selection-start-line="171" selection-start-column="81" selection-end-line="171" selection-end-column="81" />
34 <folding> 57 <folding>
35 <element signature="imports" expanded="true" /> 58 <element signature="imports" expanded="true" />
36 <element signature="e#3248#3249#0" expanded="true" /> 59 <element signature="e#3180#3181#0" expanded="true" />
37 <element signature="e#3284#3285#0" expanded="true" /> 60 <element signature="e#3216#3217#0" expanded="true" />
38 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" /> 61 <marker date="1522123711007" expanded="true" signature="4561:4658" ph="select * fro... missingValue" />
39 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " /> 62 <marker date="1522123711007" expanded="true" signature="6855:6932" ph="INSERT INTO missingValue... " />
40 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" /> 63 <marker date="1522123711007" expanded="true" signature="8292:8479" ph="CREATE TABLE... IF" />
41 </folding> 64 </folding>
42 </state> 65 </state>
43 </provider> 66 </provider>
44 </entry> 67 </entry>
45 </file> 68 </file>
69 <file leaf-file-name="TianDiTuTiledMapServiceType.java" pinned="false" current-in-tab="false">
70 <entry file="file://$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java">
71 <provider selected="true" editor-type-id="text-editor">
72 <state relative-caret-position="345">
73 <caret line="23" column="10" lean-forward="false" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
74 <folding />
75 </state>
76 </provider>
77 </entry>
78 </file>
46 </leaf> 79 </leaf>
47 </component> 80 </component>
48 <component name="FileTemplateManagerImpl"> 81 <component name="FileTemplateManagerImpl">
...@@ -67,15 +100,16 @@ ...@@ -67,15 +100,16 @@
67 <option value="$PROJECT_DIR$/src/CalEnv.java" /> 100 <option value="$PROJECT_DIR$/src/CalEnv.java" />
68 <option value="$PROJECT_DIR$/src/TianDiTuTiledMapServiceType.java" /> 101 <option value="$PROJECT_DIR$/src/TianDiTuTiledMapServiceType.java" />
69 <option value="$PROJECT_DIR$/src/TDTUrl.java" /> 102 <option value="$PROJECT_DIR$/src/TDTUrl.java" />
70 <option value="$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java" />
71 <option value="$PROJECT_DIR$/src/utils/TDTUrl.java" />
72 <option value="$PROJECT_DIR$/src/MainForm.java" /> 103 <option value="$PROJECT_DIR$/src/MainForm.java" />
73 <option value="$PROJECT_DIR$/src/MainForm.form" /> 104 <option value="$PROJECT_DIR$/src/MainForm.form" />
74 <option value="$PROJECT_DIR$/readme.md" /> 105 <option value="$PROJECT_DIR$/readme.md" />
75 <option value="$PROJECT_DIR$/src/utils/Point.java" /> 106 <option value="$PROJECT_DIR$/src/utils/Point.java" />
76 <option value="$PROJECT_DIR$/src/utils/CalEnv.java" /> 107 <option value="$PROJECT_DIR$/src/utils/CalEnv.java" />
77 <option value="$PROJECT_DIR$/src/TiandituDownload.java" /> 108 <option value="$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java" />
109 <option value="$PROJECT_DIR$/src/utils/TiandituTiledMapServiceTypeW.java" />
78 <option value="$PROJECT_DIR$/src/Main.java" /> 110 <option value="$PROJECT_DIR$/src/Main.java" />
111 <option value="$PROJECT_DIR$/src/utils/TDTUrl.java" />
112 <option value="$PROJECT_DIR$/src/TiandituDownload.java" />
79 </list> 113 </list>
80 </option> 114 </option>
81 </component> 115 </component>
...@@ -107,7 +141,9 @@ ...@@ -107,7 +141,9 @@
107 <foldersAlwaysOnTop value="true" /> 141 <foldersAlwaysOnTop value="true" />
108 </navigator> 142 </navigator>
109 <panes> 143 <panes>
144 <pane id="AndroidView" />
110 <pane id="Scratches" /> 145 <pane id="Scratches" />
146 <pane id="PackagesPane" />
111 <pane id="ProjectPane"> 147 <pane id="ProjectPane">
112 <subPane> 148 <subPane>
113 <expand> 149 <expand>
...@@ -134,9 +170,7 @@ ...@@ -134,9 +170,7 @@
134 <select /> 170 <select />
135 </subPane> 171 </subPane>
136 </pane> 172 </pane>
137 <pane id="PackagesPane" />
138 <pane id="Scope" /> 173 <pane id="Scope" />
139 <pane id="AndroidView" />
140 </panes> 174 </panes>
141 </component> 175 </component>
142 <component name="PropertiesComponent"> 176 <component name="PropertiesComponent">
...@@ -222,15 +256,25 @@ ...@@ -222,15 +256,25 @@
222 <workItem from="1522029083503" duration="8800000" /> 256 <workItem from="1522029083503" duration="8800000" />
223 <workItem from="1522044614927" duration="4004000" /> 257 <workItem from="1522044614927" duration="4004000" />
224 <workItem from="1522068118889" duration="2525000" /> 258 <workItem from="1522068118889" duration="2525000" />
225 <workItem from="1522113502843" duration="1052000" /> 259 <workItem from="1522113502843" duration="1098000" />
260 <workItem from="1522120756717" duration="2924000" />
261 </task>
262 <task id="LOCAL-00001" summary="update 3.27">
263 <created>1522117439746</created>
264 <option name="number" value="00001" />
265 <option name="presentableId" value="LOCAL-00001" />
266 <option name="project" value="LOCAL" />
267 <updated>1522117439746</updated>
226 </task> 268 </task>
269 <option name="localTasksCounter" value="2" />
227 <servers /> 270 <servers />
228 </component> 271 </component>
229 <component name="TimeTrackingManager"> 272 <component name="TimeTrackingManager">
230 <option name="totallyTimeSpent" value="16381000" /> 273 <option name="totallyTimeSpent" value="19351000" />
231 </component> 274 </component>
232 <component name="ToolWindowManager"> 275 <component name="ToolWindowManager">
233 <frame x="40" y="29" width="1400" height="771" extended-state="0" /> 276 <frame x="40" y="29" width="1400" height="771" extended-state="0" />
277 <editor active="true" />
234 <layout> 278 <layout>
235 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 279 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
236 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 280 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
...@@ -240,14 +284,15 @@ ...@@ -240,14 +284,15 @@
240 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 284 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
241 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 285 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
242 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 286 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
243 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32988167" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 287 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.37426037" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
244 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 288 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
245 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4733728" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 289 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4733728" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
246 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 290 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
247 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 291 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
248 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.102356404" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 292 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.179676" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
249 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 293 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
250 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 294 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988167" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
295 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16863033" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
251 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 296 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
252 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 297 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
253 <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 298 <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
...@@ -258,7 +303,6 @@ ...@@ -258,7 +303,6 @@
258 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 303 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
259 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 304 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
260 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 305 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
261 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988167" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
262 </layout> 306 </layout>
263 <layout-to-restore> 307 <layout-to-restore>
264 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 308 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
...@@ -296,6 +340,10 @@ ...@@ -296,6 +340,10 @@
296 <component name="VcsContentAnnotationSettings"> 340 <component name="VcsContentAnnotationSettings">
297 <option name="myLimit" value="2678400000" /> 341 <option name="myLimit" value="2678400000" />
298 </component> 342 </component>
343 <component name="VcsManagerConfiguration">
344 <MESSAGE value="update 3.27" />
345 <option name="LAST_COMMIT_MESSAGE" value="update 3.27" />
346 </component>
299 <component name="XDebuggerManager"> 347 <component name="XDebuggerManager">
300 <breakpoint-manager /> 348 <breakpoint-manager />
301 <watches-manager /> 349 <watches-manager />
...@@ -303,9 +351,47 @@ ...@@ -303,9 +351,47 @@
303 <component name="editorHistoryManager"> 351 <component name="editorHistoryManager">
304 <entry file="file://$PROJECT_DIR$/src/Main.java"> 352 <entry file="file://$PROJECT_DIR$/src/Main.java">
305 <provider selected="true" editor-type-id="text-editor"> 353 <provider selected="true" editor-type-id="text-editor">
354 <state relative-caret-position="45">
355 <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
356 <folding>
357 <element signature="imports" expanded="true" />
358 </folding>
359 </state>
360 </provider>
361 </entry>
362 <entry file="file://$PROJECT_DIR$/readme.md">
363 <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
364 <state split_layout="SPLIT">
365 <first_editor relative-caret-position="255">
366 <caret line="17" column="3" lean-forward="false" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
367 <folding />
368 </first_editor>
369 <second_editor />
370 </state>
371 </provider>
372 </entry>
373 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
374 <provider selected="true" editor-type-id="text-editor">
375 <state relative-caret-position="2145">
376 <caret line="143" column="5" lean-forward="true" selection-start-line="143" selection-start-column="5" selection-end-line="143" selection-end-column="5" />
377 <folding>
378 <element signature="imports" expanded="true" />
379 <element signature="e#3180#3181#0" expanded="true" />
380 <element signature="e#3216#3217#0" expanded="true" />
381 <marker date="1522123711007" expanded="true" signature="4561:4658" ph="select * fro... missingValue" />
382 <marker date="1522123711007" expanded="true" signature="6855:6932" ph="INSERT INTO missingValue... " />
383 <marker date="1522123711007" expanded="true" signature="8292:8479" ph="CREATE TABLE... IF" />
384 </folding>
385 </state>
386 </provider>
387 </entry>
388 <entry file="file://$PROJECT_DIR$/src/Main.java">
389 <provider selected="true" editor-type-id="text-editor">
306 <state relative-caret-position="210"> 390 <state relative-caret-position="210">
307 <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> 391 <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
308 <folding /> 392 <folding>
393 <element signature="imports" expanded="true" />
394 </folding>
309 </state> 395 </state>
310 </provider> 396 </provider>
311 </entry> 397 </entry>
...@@ -315,11 +401,11 @@ ...@@ -315,11 +401,11 @@
315 <caret line="149" column="45" lean-forward="true" selection-start-line="149" selection-start-column="45" selection-end-line="149" selection-end-column="45" /> 401 <caret line="149" column="45" lean-forward="true" selection-start-line="149" selection-start-column="45" selection-end-line="149" selection-end-column="45" />
316 <folding> 402 <folding>
317 <element signature="imports" expanded="true" /> 403 <element signature="imports" expanded="true" />
318 <element signature="e#3248#3249#0" expanded="true" /> 404 <element signature="e#3180#3181#0" expanded="true" />
319 <element signature="e#3284#3285#0" expanded="true" /> 405 <element signature="e#3216#3217#0" expanded="true" />
320 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" /> 406 <marker date="1522123711007" expanded="true" signature="4561:4658" ph="select * fro... missingValue" />
321 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " /> 407 <marker date="1522123711007" expanded="true" signature="6855:6932" ph="INSERT INTO missingValue... " />
322 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" /> 408 <marker date="1522123711007" expanded="true" signature="8292:8479" ph="CREATE TABLE... IF" />
323 </folding> 409 </folding>
324 </state> 410 </state>
325 </provider> 411 </provider>
...@@ -328,7 +414,9 @@ ...@@ -328,7 +414,9 @@
328 <provider selected="true" editor-type-id="text-editor"> 414 <provider selected="true" editor-type-id="text-editor">
329 <state relative-caret-position="165"> 415 <state relative-caret-position="165">
330 <caret line="14" column="87" lean-forward="false" selection-start-line="14" selection-start-column="87" selection-end-line="14" selection-end-column="87" /> 416 <caret line="14" column="87" lean-forward="false" selection-start-line="14" selection-start-column="87" selection-end-line="14" selection-end-column="87" />
331 <folding /> 417 <folding>
418 <element signature="imports" expanded="true" />
419 </folding>
332 </state> 420 </state>
333 </provider> 421 </provider>
334 </entry> 422 </entry>
...@@ -338,11 +426,11 @@ ...@@ -338,11 +426,11 @@
338 <caret line="114" column="60" lean-forward="true" selection-start-line="114" selection-start-column="60" selection-end-line="114" selection-end-column="60" /> 426 <caret line="114" column="60" lean-forward="true" selection-start-line="114" selection-start-column="60" selection-end-line="114" selection-end-column="60" />
339 <folding> 427 <folding>
340 <element signature="imports" expanded="true" /> 428 <element signature="imports" expanded="true" />
341 <element signature="e#3248#3249#0" expanded="true" /> 429 <element signature="e#3180#3181#0" expanded="true" />
342 <element signature="e#3284#3285#0" expanded="true" /> 430 <element signature="e#3216#3217#0" expanded="true" />
343 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" /> 431 <marker date="1522123711007" expanded="true" signature="4561:4658" ph="select * fro... missingValue" />
344 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " /> 432 <marker date="1522123711007" expanded="true" signature="6855:6932" ph="INSERT INTO missingValue... " />
345 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" /> 433 <marker date="1522123711007" expanded="true" signature="8292:8479" ph="CREATE TABLE... IF" />
346 </folding> 434 </folding>
347 </state> 435 </state>
348 </provider> 436 </provider>
...@@ -388,7 +476,9 @@ ...@@ -388,7 +476,9 @@
388 <provider selected="true" editor-type-id="text-editor"> 476 <provider selected="true" editor-type-id="text-editor">
389 <state relative-caret-position="180"> 477 <state relative-caret-position="180">
390 <caret line="15" column="83" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="15" selection-end-column="83" /> 478 <caret line="15" column="83" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="15" selection-end-column="83" />
391 <folding /> 479 <folding>
480 <element signature="imports" expanded="true" />
481 </folding>
392 </state> 482 </state>
393 </provider> 483 </provider>
394 </entry> 484 </entry>
...@@ -398,11 +488,11 @@ ...@@ -398,11 +488,11 @@
398 <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" /> 488 <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" />
399 <folding> 489 <folding>
400 <element signature="imports" expanded="true" /> 490 <element signature="imports" expanded="true" />
401 <element signature="e#3248#3249#0" expanded="true" /> 491 <element signature="e#3180#3181#0" expanded="true" />
402 <element signature="e#3284#3285#0" expanded="true" /> 492 <element signature="e#3216#3217#0" expanded="true" />
403 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" /> 493 <marker date="1522123711007" expanded="true" signature="4561:4658" ph="select * fro... missingValue" />
404 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " /> 494 <marker date="1522123711007" expanded="true" signature="6855:6932" ph="INSERT INTO missingValue... " />
405 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" /> 495 <marker date="1522123711007" expanded="true" signature="8292:8479" ph="CREATE TABLE... IF" />
406 </folding> 496 </folding>
407 </state> 497 </state>
408 </provider> 498 </provider>
...@@ -453,6 +543,25 @@ ...@@ -453,6 +543,25 @@
453 </entry> 543 </entry>
454 <entry file="file://$PROJECT_DIR$/src/MainForm.form" /> 544 <entry file="file://$PROJECT_DIR$/src/MainForm.form" />
455 <entry file="file://$PROJECT_DIR$/src/MainForm.java" /> 545 <entry file="file://$PROJECT_DIR$/src/MainForm.java" />
546 <entry file="file://$PROJECT_DIR$/src/utils/Point.java">
547 <provider selected="true" editor-type-id="text-editor">
548 <state relative-caret-position="45">
549 <caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
550 <folding />
551 </state>
552 </provider>
553 </entry>
554 <entry file="file://$PROJECT_DIR$/src/utils/CalEnv.java">
555 <provider selected="true" editor-type-id="text-editor">
556 <state relative-caret-position="253">
557 <caret line="28" column="27" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
558 <folding>
559 <element signature="e#487#488#0" expanded="true" />
560 <element signature="e#527#528#0" expanded="true" />
561 </folding>
562 </state>
563 </provider>
564 </entry>
456 <entry file="file://$PROJECT_DIR$/readme.md"> 565 <entry file="file://$PROJECT_DIR$/readme.md">
457 <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> 566 <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
458 <state split_layout="SPLIT"> 567 <state split_layout="SPLIT">
...@@ -464,66 +573,57 @@ ...@@ -464,66 +573,57 @@
464 </state> 573 </state>
465 </provider> 574 </provider>
466 </entry> 575 </entry>
467 <entry file="file://$PROJECT_DIR$/src/utils/Point.java"> 576 <entry file="file://$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java">
468 <provider selected="true" editor-type-id="text-editor"> 577 <provider selected="true" editor-type-id="text-editor">
469 <state relative-caret-position="45"> 578 <state relative-caret-position="345">
470 <caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" /> 579 <caret line="23" column="10" lean-forward="false" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
471 <folding /> 580 <folding />
472 </state> 581 </state>
473 </provider> 582 </provider>
474 </entry> 583 </entry>
475 <entry file="file://$PROJECT_DIR$/src/utils/TianDiTuTiledMapServiceType.java"> 584 <entry file="file://$PROJECT_DIR$/src/utils/TiandituTiledMapServiceTypeW.java">
476 <provider selected="true" editor-type-id="text-editor"> 585 <provider selected="true" editor-type-id="text-editor">
477 <state relative-caret-position="30"> 586 <state relative-caret-position="45">
478 <caret line="2" column="3" lean-forward="false" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" /> 587 <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
479 <folding /> 588 <folding />
480 </state> 589 </state>
481 </provider> 590 </provider>
482 </entry> 591 </entry>
483 <entry file="file://$PROJECT_DIR$/src/utils/TDTUrl.java"> 592 <entry file="file://$PROJECT_DIR$/src/utils/TDTUrl.java">
484 <provider selected="true" editor-type-id="text-editor"> 593 <provider selected="true" editor-type-id="text-editor">
485 <state relative-caret-position="-467"> 594 <state relative-caret-position="720">
486 <caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> 595 <caret line="48" column="5" lean-forward="false" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
487 <folding> 596 <folding>
488 <element signature="imports" expanded="true" /> 597 <element signature="imports" expanded="true" />
489 </folding> 598 </folding>
490 </state> 599 </state>
491 </provider> 600 </provider>
492 </entry> 601 </entry>
493 <entry file="file://$PROJECT_DIR$/src/utils/CalEnv.java"> 602 <entry file="file://$PROJECT_DIR$/src/Main.java">
494 <provider selected="true" editor-type-id="text-editor"> 603 <provider selected="true" editor-type-id="text-editor">
495 <state relative-caret-position="253"> 604 <state relative-caret-position="135">
496 <caret line="28" column="27" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" /> 605 <caret line="9" column="55" lean-forward="false" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
497 <folding> 606 <folding>
498 <element signature="e#487#488#0" expanded="true" /> 607 <element signature="imports" expanded="true" />
499 <element signature="e#527#528#0" expanded="true" />
500 </folding> 608 </folding>
501 </state> 609 </state>
502 </provider> 610 </provider>
503 </entry> 611 </entry>
504 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 612 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
505 <provider selected="true" editor-type-id="text-editor"> 613 <provider selected="true" editor-type-id="text-editor">
506 <state relative-caret-position="235"> 614 <state relative-caret-position="79">
507 <caret line="143" column="5" lean-forward="true" selection-start-line="143" selection-start-column="5" selection-end-line="143" selection-end-column="5" /> 615 <caret line="171" column="81" lean-forward="true" selection-start-line="171" selection-start-column="81" selection-end-line="171" selection-end-column="81" />
508 <folding> 616 <folding>
509 <element signature="imports" expanded="true" /> 617 <element signature="imports" expanded="true" />
510 <element signature="e#3248#3249#0" expanded="true" /> 618 <element signature="e#3180#3181#0" expanded="true" />
511 <element signature="e#3284#3285#0" expanded="true" /> 619 <element signature="e#3216#3217#0" expanded="true" />
512 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" /> 620 <marker date="1522123711007" expanded="true" signature="4561:4658" ph="select * fro... missingValue" />
513 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " /> 621 <marker date="1522123711007" expanded="true" signature="6855:6932" ph="INSERT INTO missingValue... " />
514 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" /> 622 <marker date="1522123711007" expanded="true" signature="8292:8479" ph="CREATE TABLE... IF" />
515 </folding> 623 </folding>
516 </state> 624 </state>
517 </provider> 625 </provider>
518 </entry> 626 </entry>
519 <entry file="file://$PROJECT_DIR$/src/Main.java">
520 <provider selected="true" editor-type-id="text-editor">
521 <state relative-caret-position="45">
522 <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
523 <folding />
524 </state>
525 </provider>
526 </entry>
527 </component> 627 </component>
528 <component name="masterDetails"> 628 <component name="masterDetails">
529 <states> 629 <states>
......
No preview for this file type
1 import utils.CalEnv;
2 import utils.Point; 1 import utils.Point;
3 import utils.TianDiTuTiledMapServiceType; 2 import utils.TianDiTuTiledMapServiceType;
4 3
...@@ -8,12 +7,13 @@ public class Main{ ...@@ -8,12 +7,13 @@ public class Main{
8 7
9 8
10 public static void main(String[] args) throws SQLException { 9 public static void main(String[] args) throws SQLException {
11 System.out.println("Hello World!"); 10 System.out.println("开始下载，本程序仅支持下载CGCS2000的天地图数据!");
12 11
13 TiandituDownload tiandituDownload = new TiandituDownload("my.db"); 12 TiandituDownload tiandituDownload = new TiandituDownload("my.db");
14 Point pt = new Point(29.76,106.64); 13 Point pt = new Point(29.76,106.64);
15 Point pt2 = new Point(35.33, 108.12); 14 Point pt2 = new Point(35.33, 108.12);
16 15
17 tiandituDownload.Download(pt, pt2, 7,9, TianDiTuTiledMapServiceType.VEC_C, true); 16 tiandituDownload.Download(pt, pt2, 7,9, TianDiTuTiledMapServiceType.IMG_C, true);
18 } 17 }
18
19 } 19 }
......
1 import utils.CalEnv; 1 import utils.*;
2 import utils.Point; 2 import utils.Point;
3 import utils.TDTUrl;
4 import utils.TianDiTuTiledMapServiceType;
5 3
6 import javax.imageio.ImageIO; 4 import javax.imageio.ImageIO;
7 import java.awt.*; 5 import java.awt.*;
...@@ -221,6 +219,7 @@ public class TiandituDownload { ...@@ -221,6 +219,7 @@ public class TiandituDownload {
221 } 219 }
222 } 220 }
223 221
222
224 /** 223 /**
225 * @param minPoint 下载范围左下角坐标 224 * @param minPoint 下载范围左下角坐标
226 * @param maxPoint 下载范围右上角坐标 225 * @param maxPoint 下载范围右上角坐标
......
...@@ -22,6 +22,7 @@ public class TDTUrl { ...@@ -22,6 +22,7 @@ public class TDTUrl {
22 this._tiandituMapServiceType = tiandituMapServiceType; 22 this._tiandituMapServiceType = tiandituMapServiceType;
23 } 23 }
24 24
25
25 public String generatUrl() { 26 public String generatUrl() {
26 27
27 StringBuilder url = new StringBuilder("http://t"); 28 StringBuilder url = new StringBuilder("http://t");
...@@ -41,18 +42,6 @@ public class TDTUrl { ...@@ -41,18 +42,6 @@ public class TDTUrl {
41 case IMG_C: 42 case IMG_C:
42 url.append(".tianditu.com/DataServer?T=img_c&X=").append(this._col).append("&Y=").append(this._row).append("&L=").append(this._level); 43 url.append(".tianditu.com/DataServer?T=img_c&X=").append(this._col).append("&Y=").append(this._row).append("&L=").append(this._level);
43 break; 44 break;
44 case VEC_W:
45 url.append(".tianditu.com/DataServer?T=vec_w&X=").append(this._col).append("&Y=").append(this._row).append("&L=").append(this._level);
46 break;
47 case CVA_W:
48 url.append(".tianditu.com/DataServer?T=cva_w&X=").append(this._col).append("&Y=").append(this._row).append("&L=").append(this._level);
49 break;
50 case CIA_W:
51 url.append(".tianditu.com/DataServer?T=cia_w&X=").append(this._col).append("&Y=").append(this._row).append("&L=").append(this._level);
52 break;
53 case IMG_W:
54 url.append(".tianditu.com/DataServer?T=img_w&X=").append(this._col).append("&Y=").append(this._row).append("&L=").append(this._level);
55 break;
56 default: 45 default:
57 return null; 46 return null;
58 } 47 }
......
...@@ -21,22 +21,6 @@ public enum TianDiTuTiledMapServiceType { ...@@ -21,22 +21,6 @@ public enum TianDiTuTiledMapServiceType {
21 /** 21 /**
22 * 影像注记 22 * 影像注记
23 * */ 23 * */
24 CIA_C, 24 CIA_C;
25 /**
26 * 矢量数据，web墨卡托4326
27 */
28 VEC_W,
29 /**
30 * 影像数据
31 * */
32 IMG_W,
33 /**
34 * 矢量注记
35 * */
36 CVA_W,
37 /**
38 * 影像注记
39 * */
40 CIA_W;
41 25
42 } 26 }
......