Skip to content

蒋波涛 / tianditudownloader

Go to a project
Toggle navigation
Toggle navigation pinning
05db60ef by chiangbt
Options

update 3.27

1 parent b5905b49
Inline Side-by-side
Showing 3 changed files with 134 additions and 89 deletions
...@@ -2,16 +2,9 @@ ...@@ -2,16 +2,9 @@
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/TiandituDownload.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/TiandituDownload.class" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/CalEnv.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/CalEnv.class" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/Point.class" afterPath="$PROJECT_DIR$/out/production/TiandituDownloader/utils/Point.class" />
9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/readme.md" afterPath="$PROJECT_DIR$/readme.md" />
11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Main.java" afterPath="$PROJECT_DIR$/src/Main.java" />
12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/TiandituDownload.java" afterPath="$PROJECT_DIR$/src/TiandituDownload.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/utils/CalEnv.java" afterPath="$PROJECT_DIR$/src/utils/CalEnv.java" />
14 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils/Point.java" afterPath="$PROJECT_DIR$/src/utils/Point.java" />
15 </list> 8 </list>
16 <ignored path="$PROJECT_DIR$/out/" /> 9 <ignored path="$PROJECT_DIR$/out/" />
17 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -23,32 +16,28 @@ ...@@ -23,32 +16,28 @@
23 </component> 16 </component>
24 <component name="FileEditorManager"> 17 <component name="FileEditorManager">
25 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 18 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
26 <file leaf-file-name="Main.java" pinned="false" current-in-tab="false"> 19 <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
27 <entry file="file://$PROJECT_DIR$/src/Main.java"> 20 <entry file="file://$PROJECT_DIR$/src/Main.java">
28 <provider selected="true" editor-type-id="text-editor"> 21 <provider selected="true" editor-type-id="text-editor">
29 <state relative-caret-position="210"> 22 <state relative-caret-position="45">
30 <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> 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 <folding> 24 <folding />
32 <element signature="imports" expanded="true" />
33 </folding>
34 </state> 25 </state>
35 </provider> 26 </provider>
36 </entry> 27 </entry>
37 </file> 28 </file>
38 <file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="true"> 29 <file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="false">
39 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 30 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
40 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
41 <state relative-caret-position="1605"> 32 <state relative-caret-position="235">
42 <caret line="109" column="132" lean-forward="false" selection-start-line="109" selection-start-column="132" selection-end-line="109" selection-end-column="132" /> 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" />
43 <folding> 34 <folding>
44 <element signature="imports" expanded="true" /> 35 <element signature="imports" expanded="true" />
45 <element signature="e#2102#2103#0" expanded="true" /> 36 <element signature="e#3248#3249#0" expanded="true" />
46 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" /> 37 <element signature="e#3284#3285#0" expanded="true" />
47 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" /> 38 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" />
48 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" /> 39 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " />
49 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" /> 40 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" />
50 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
51 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
52 </folding> 41 </folding>
53 </state> 42 </state>
54 </provider> 43 </provider>
...@@ -85,8 +74,8 @@ ...@@ -85,8 +74,8 @@
85 <option value="$PROJECT_DIR$/readme.md" /> 74 <option value="$PROJECT_DIR$/readme.md" />
86 <option value="$PROJECT_DIR$/src/utils/Point.java" /> 75 <option value="$PROJECT_DIR$/src/utils/Point.java" />
87 <option value="$PROJECT_DIR$/src/utils/CalEnv.java" /> 76 <option value="$PROJECT_DIR$/src/utils/CalEnv.java" />
88 <option value="$PROJECT_DIR$/src/Main.java" />
89 <option value="$PROJECT_DIR$/src/TiandituDownload.java" /> 77 <option value="$PROJECT_DIR$/src/TiandituDownload.java" />
78 <option value="$PROJECT_DIR$/src/Main.java" />
90 </list> 79 </list>
91 </option> 80 </option>
92 </component> 81 </component>
...@@ -97,7 +86,7 @@ ...@@ -97,7 +86,7 @@
97 <sorting>DEFINITION_ORDER</sorting> 86 <sorting>DEFINITION_ORDER</sorting>
98 </component> 87 </component>
99 <component name="ProjectFrameBounds"> 88 <component name="ProjectFrameBounds">
100 <option name="x" value="171" /> 89 <option name="x" value="40" />
101 <option name="y" value="29" /> 90 <option name="y" value="29" />
102 <option name="width" value="1400" /> 91 <option name="width" value="1400" />
103 <option name="height" value="771" /> 92 <option name="height" value="771" />
...@@ -118,9 +107,7 @@ ...@@ -118,9 +107,7 @@
118 <foldersAlwaysOnTop value="true" /> 107 <foldersAlwaysOnTop value="true" />
119 </navigator> 108 </navigator>
120 <panes> 109 <panes>
121 <pane id="Scope" />
122 <pane id="Scratches" /> 110 <pane id="Scratches" />
123 <pane id="PackagesPane" />
124 <pane id="ProjectPane"> 111 <pane id="ProjectPane">
125 <subPane> 112 <subPane>
126 <expand> 113 <expand>
...@@ -147,6 +134,8 @@ ...@@ -147,6 +134,8 @@
147 <select /> 134 <select />
148 </subPane> 135 </subPane>
149 </pane> 136 </pane>
137 <pane id="PackagesPane" />
138 <pane id="Scope" />
150 <pane id="AndroidView" /> 139 <pane id="AndroidView" />
151 </panes> 140 </panes>
152 </component> 141 </component>
...@@ -232,15 +221,16 @@ ...@@ -232,15 +221,16 @@
232 <updated>1522029080525</updated> 221 <updated>1522029080525</updated>
233 <workItem from="1522029083503" duration="8800000" /> 222 <workItem from="1522029083503" duration="8800000" />
234 <workItem from="1522044614927" duration="4004000" /> 223 <workItem from="1522044614927" duration="4004000" />
235 <workItem from="1522068118889" duration="2393000" /> 224 <workItem from="1522068118889" duration="2525000" />
225 <workItem from="1522113502843" duration="1052000" />
236 </task> 226 </task>
237 <servers /> 227 <servers />
238 </component> 228 </component>
239 <component name="TimeTrackingManager"> 229 <component name="TimeTrackingManager">
240 <option name="totallyTimeSpent" value="15197000" /> 230 <option name="totallyTimeSpent" value="16381000" />
241 </component> 231 </component>
242 <component name="ToolWindowManager"> 232 <component name="ToolWindowManager">
243 <frame x="171" y="29" width="1400" height="771" extended-state="0" /> 233 <frame x="40" y="29" width="1400" height="771" extended-state="0" />
244 <layout> 234 <layout>
245 <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" /> 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" />
246 <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" /> 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" />
...@@ -250,14 +240,13 @@ ...@@ -250,14 +240,13 @@
250 <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" /> 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" />
251 <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" /> 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" />
252 <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" /> 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" />
253 <window_info id="Run" 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="2" 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" />
254 <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" /> 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" />
255 <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4733728" 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" />
256 <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" /> 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" />
257 <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" /> 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" />
258 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.100883655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 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" />
259 <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" /> 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" />
260 <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" />
261 <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" /> 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" />
262 <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" /> 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" />
263 <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" /> 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" />
...@@ -269,6 +258,7 @@ ...@@ -269,6 +258,7 @@
269 <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" /> 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" />
270 <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" /> 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" />
271 <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" /> 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" />
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" />
272 </layout> 262 </layout>
273 <layout-to-restore> 263 <layout-to-restore>
274 <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" /> 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" />
...@@ -313,27 +303,46 @@ ...@@ -313,27 +303,46 @@
313 <component name="editorHistoryManager"> 303 <component name="editorHistoryManager">
314 <entry file="file://$PROJECT_DIR$/src/Main.java"> 304 <entry file="file://$PROJECT_DIR$/src/Main.java">
315 <provider selected="true" editor-type-id="text-editor"> 305 <provider selected="true" editor-type-id="text-editor">
316 <state relative-caret-position="165"> 306 <state relative-caret-position="210">
317 <caret line="14" column="87" lean-forward="false" selection-start-line="14" selection-start-column="87" selection-end-line="14" selection-end-column="87" /> 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" />
308 <folding />
309 </state>
310 </provider>
311 </entry>
312 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
313 <provider selected="true" editor-type-id="text-editor">
314 <state relative-caret-position="2235">
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" />
318 <folding> 316 <folding>
319 <element signature="imports" expanded="true" /> 317 <element signature="imports" expanded="true" />
318 <element signature="e#3248#3249#0" expanded="true" />
319 <element signature="e#3284#3285#0" expanded="true" />
320 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" />
321 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " />
322 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" />
320 </folding> 323 </folding>
321 </state> 324 </state>
322 </provider> 325 </provider>
323 </entry> 326 </entry>
327 <entry file="file://$PROJECT_DIR$/src/Main.java">
328 <provider selected="true" editor-type-id="text-editor">
329 <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" />
331 <folding />
332 </state>
333 </provider>
334 </entry>
324 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 335 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
325 <provider selected="true" editor-type-id="text-editor"> 336 <provider selected="true" editor-type-id="text-editor">
326 <state relative-caret-position="1710"> 337 <state relative-caret-position="1710">
327 <caret line="114" column="60" lean-forward="true" selection-start-line="114" selection-start-column="60" selection-end-line="114" selection-end-column="60" /> 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" />
328 <folding> 339 <folding>
329 <element signature="imports" expanded="true" /> 340 <element signature="imports" expanded="true" />
330 <element signature="e#2102#2103#0" expanded="true" /> 341 <element signature="e#3248#3249#0" expanded="true" />
331 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" /> 342 <element signature="e#3284#3285#0" expanded="true" />
332 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" /> 343 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" />
333 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" /> 344 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " />
334 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" /> 345 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" />
335 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
336 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
337 </folding> 346 </folding>
338 </state> 347 </state>
339 </provider> 348 </provider>
...@@ -379,9 +388,7 @@ ...@@ -379,9 +388,7 @@
379 <provider selected="true" editor-type-id="text-editor"> 388 <provider selected="true" editor-type-id="text-editor">
380 <state relative-caret-position="180"> 389 <state relative-caret-position="180">
381 <caret line="15" column="83" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="15" selection-end-column="83" /> 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" />
382 <folding> 391 <folding />
383 <element signature="imports" expanded="true" />
384 </folding>
385 </state> 392 </state>
386 </provider> 393 </provider>
387 </entry> 394 </entry>
...@@ -391,13 +398,11 @@ ...@@ -391,13 +398,11 @@
391 <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" /> 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" />
392 <folding> 399 <folding>
393 <element signature="imports" expanded="true" /> 400 <element signature="imports" expanded="true" />
394 <element signature="e#2102#2103#0" expanded="true" /> 401 <element signature="e#3248#3249#0" expanded="true" />
395 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" /> 402 <element signature="e#3284#3285#0" expanded="true" />
396 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" /> 403 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" />
397 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" /> 404 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " />
398 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" /> 405 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" />
399 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
400 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
401 </folding> 406 </folding>
402 </state> 407 </state>
403 </provider> 408 </provider>
...@@ -496,30 +501,26 @@ ...@@ -496,30 +501,26 @@
496 </state> 501 </state>
497 </provider> 502 </provider>
498 </entry> 503 </entry>
499 <entry file="file://$PROJECT_DIR$/src/Main.java"> 504 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
500 <provider selected="true" editor-type-id="text-editor"> 505 <provider selected="true" editor-type-id="text-editor">
501 <state relative-caret-position="210"> 506 <state relative-caret-position="235">
502 <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> 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" />
503 <folding> 508 <folding>
504 <element signature="imports" expanded="true" /> 509 <element signature="imports" expanded="true" />
510 <element signature="e#3248#3249#0" expanded="true" />
511 <element signature="e#3284#3285#0" expanded="true" />
512 <marker date="1522117421550" expanded="true" signature="4629:4726" ph="select * fro... missingValue" />
513 <marker date="1522117421550" expanded="true" signature="6923:7000" ph="INSERT INTO missingValue... " />
514 <marker date="1522117421550" expanded="true" signature="8359:8546" ph="CREATE TABLE... IF" />
505 </folding> 515 </folding>
506 </state> 516 </state>
507 </provider> 517 </provider>
508 </entry> 518 </entry>
509 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 519 <entry file="file://$PROJECT_DIR$/src/Main.java">
510 <provider selected="true" editor-type-id="text-editor"> 520 <provider selected="true" editor-type-id="text-editor">
511 <state relative-caret-position="1605"> 521 <state relative-caret-position="45">
512 <caret line="109" column="132" lean-forward="false" selection-start-line="109" selection-start-column="132" selection-end-line="109" selection-end-column="132" /> 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" />
513 <folding> 523 <folding />
514 <element signature="imports" expanded="true" />
515 <element signature="e#2102#2103#0" expanded="true" />
516 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
517 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
518 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
519 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
520 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
521 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
522 </folding>
523 </state> 524 </state>
524 </provider> 525 </provider>
525 </entry> 526 </entry>
......
1 import utils.CalEnv;
1 import utils.Point; 2 import utils.Point;
2 import utils.TianDiTuTiledMapServiceType; 3 import utils.TianDiTuTiledMapServiceType;
3 4
......
...@@ -20,7 +20,7 @@ public class TiandituDownload { ...@@ -20,7 +20,7 @@ public class TiandituDownload {
20 int[] level = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}; 20 int[] level = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
21 21
22 // 分辨率 22 // 分辨率
23 double[] res = { 23 double[] res4490 = {
24 1.40625, 24 1.40625,
25 0.703125, 25 0.703125,
26 0.3515625, 26 0.3515625,
...@@ -44,7 +44,7 @@ public class TiandituDownload { ...@@ -44,7 +44,7 @@ public class TiandituDownload {
44 1.34110450744629E-06 44 1.34110450744629E-06
45 }; 45 };
46 // 比例尺 46 // 比例尺
47 double[] scale = { 47 double[] scale4490 = {
48 400000000, 48 400000000,
49 295497598.5708346, 49 295497598.5708346,
50 147748799.285417, 50 147748799.285417,
...@@ -67,6 +67,47 @@ public class TiandituDownload { ...@@ -67,6 +67,47 @@ public class TiandituDownload {
67 1127.2338812669175, 67 1127.2338812669175,
68 563.61694063345875 68 563.61694063345875
69 }; 69 };
70
71 double[] scale3857 = {
72 295829355.45,
73 147914677.73,
74 73957338.86,
75 36978669.43,
76 18489334.72,
77 9244667.36,
78 4622333.68,
79 2311166.84,
80 1155583.42,
81 577791.71,
82 288895.85,
83 144447.93,
84 72223.96,
85 36111.98,
86 18055.99,
87 9028,
88 4514,
89 2257};
90
91 double[] res3857 = {
92 0.70391441567318025,
93 0.35195720784848739,
94 0.1759786039123464,
95 0.087989301956173202,
96 0.043994650989983904,
97 0.021997325494991952,
98 0.010998662747495976,
99 0.005499331373747988,
100 0.002749665686873994,
101 0.001374832843436997,
102 0.00068741640982119352,
103 0.00034370821680790179,
104 0.00017185409650664589,
105 8.5927048253322947e-005,
106 4.2963524126661473e-005,
107 2.1481773960635764e-005,
108 1.0740886980317882e-005,
109 5.3704434901589409e-006};
110
70 // 最小级别 111 // 最小级别
71 int minLevel = 1; 112 int minLevel = 1;
72 113
...@@ -80,19 +121,22 @@ public class TiandituDownload { ...@@ -80,19 +121,22 @@ public class TiandituDownload {
80 Connection conn = null; 121 Connection conn = null;
81 Statement stmt = null; 122 Statement stmt = null;
82 123
124 public TiandituDownload() {
125
126 }
127
83 public TiandituDownload(String dbpath) { 128 public TiandituDownload(String dbpath) {
84 this.dbpath = dbpath; 129 this.dbpath = dbpath;
85 } 130 }
86 131
87 /** 132 /**
88 *
89 * @param originPoint 坐标点 133 * @param originPoint 坐标点
90 * @param level 级别 134 * @param level 级别
91 * @return 改点在该级别所属的地图瓦片行列号 135 * @return 改点在该级别所属的地图瓦片行列号(4490)
92 */ 136 */
93 private CalEnv calculateEnv(Point originPoint, int level) { 137 private CalEnv calculateEnv4490(Point originPoint, int level) {
94 int startX = (int) Math.floor((originPoint.getLng() + 180) / (256 * res[level])); 138 int startX = (int) Math.floor((originPoint.getLng() + 180) / (256 * res4490[level]));
95 int startY = (int) Math.floor((90 - originPoint.getLat()) / (256 * res[level])); 139 int startY = (int) Math.floor((90 - originPoint.getLat()) / (256 * res4490[level]));
96 if (startX < 0) startX = 0; 140 if (startX < 0) startX = 0;
97 if (startY < 0) startY = 0; 141 if (startY < 0) startY = 0;
98 142
...@@ -100,18 +144,17 @@ public class TiandituDownload { ...@@ -100,18 +144,17 @@ public class TiandituDownload {
100 } 144 }
101 145
102 /** 146 /**
103 *
104 * @param minPoint 下载范围左下角坐标 147 * @param minPoint 下载范围左下角坐标
105 * @param maxPoint 下载范围右上角坐标 148 * @param maxPoint 下载范围右上角坐标
106 * @param level 下载级别 149 * @param level 下载级别
107 * @param type 下载数据类型 150 * @param type 下载数据类型
108 * @param merge 数据与其注记是否融合 151 * @param merge 数据与其注记是否融合
109 */ 152 */
110 private void downloadSingLevelTiles(Point minPoint, Point maxPoint, int level, TianDiTuTiledMapServiceType type, boolean merge) { 153 private void downloadSingLevelTiles(Point minPoint, Point maxPoint, int level, TianDiTuTiledMapServiceType type, boolean merge) {
111 154
112 try { 155 try {
113 CalEnv startEnv = calculateEnv(minPoint, level); 156 CalEnv startEnv = calculateEnv4490(minPoint, level);
114 CalEnv stopEnv = calculateEnv(maxPoint, level); 157 CalEnv stopEnv = calculateEnv4490(maxPoint, level);
115 158
116 PreparedStatement preparedStatement; 159 PreparedStatement preparedStatement;
117 ResultSet rs; 160 ResultSet rs;
...@@ -179,13 +222,12 @@ public class TiandituDownload { ...@@ -179,13 +222,12 @@ public class TiandituDownload {
179 } 222 }
180 223
181 /** 224 /**
182 *
183 * @param minPoint 下载范围左下角坐标 225 * @param minPoint 下载范围左下角坐标
184 * @param maxPoint 下载范围右上角坐标 226 * @param maxPoint 下载范围右上角坐标
185 * @param minLevel 下载最小级别 227 * @param minLevel 下载最小级别
186 * @param maxLevel 下载最大级别 228 * @param maxLevel 下载最大级别
187 * @param type 下载数据类型 229 * @param type 下载数据类型
188 * @param merge 数据与其注记是否融合 230 * @param merge 数据与其注记是否融合
189 * @throws SQLException 231 * @throws SQLException
190 */ 232 */
191 public void Download(Point minPoint, Point maxPoint, int minLevel, int maxLevel, TianDiTuTiledMapServiceType type, boolean merge) throws SQLException { 233 public void Download(Point minPoint, Point maxPoint, int minLevel, int maxLevel, TianDiTuTiledMapServiceType type, boolean merge) throws SQLException {
...@@ -216,6 +258,7 @@ public class TiandituDownload { ...@@ -216,6 +258,7 @@ public class TiandituDownload {
216 258
217 /** 259 /**
218 * 下载网络数据 260 * 下载网络数据
261 *
219 * @param url 262 * @param url
220 * @return 图片数据流 263 * @return 图片数据流
221 * @throws Exception 264 * @throws Exception
......