From 8d875d388f9ca396e254f1a3cec426d0f633dde7 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Thu, 19 Dec 2019 15:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E5=85=AC=E6=B9=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 71 ++++++++++++++++++++++-----------------------
 js/map.js           | 10 +++++--
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 91a59dd..9636ec6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,6 @@
     <list default="true" id="0b71a6a1-d7aa-4903-a1f1-4488fea56112" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/js/map.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/map.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test.html" beforeDir="false" afterPath="$PROJECT_DIR$/test.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -29,8 +28,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="179">
-              <caret line="929" column="32" selection-start-line="929" selection-start-column="32" selection-end-line="929" selection-end-column="39" />
+            <state relative-caret-position="193">
+              <caret line="168" column="32" lean-forward="true" selection-start-line="166" selection-start-column="12" selection-end-line="168" selection-end-column="32" />
               <folding>
                 <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
@@ -68,11 +67,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/map.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2261">
-              <caret line="119" column="43" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="43" />
+            <state relative-caret-position="-505">
+              <caret line="367" column="86" lean-forward="true" selection-start-line="367" selection-start-column="35" selection-end-line="367" selection-end-column="86" />
             </state>
           </provider>
         </entry>
@@ -88,11 +87,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/map.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="458" column="32" selection-start-line="458" selection-start-column="32" selection-end-line="458" selection-end-column="32" />
+            <state relative-caret-position="7372">
+              <caret line="388" column="24" selection-start-line="388" selection-start-column="24" selection-end-line="388" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -101,16 +100,17 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>班公湖</find>
       <find>任意</find>
       <find>api.ownthink</find>
       <find>知识</find>
       <find>china</find>
       <find>交易量</find>
-      <find>backg</find>
       <find>brush</find>
       <find>geo:</find>
       <find>brush:</find>
+      <find>backg</find>
+      <find>班公湖</find>
+      <find>http</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -188,18 +188,17 @@
       <updated>1576569407340</updated>
       <workItem from="1576569409159" duration="1687000" />
       <workItem from="1576671812636" duration="1016000" />
-      <workItem from="1576723846646" duration="4765000" />
+      <workItem from="1576723846646" duration="5964000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7468000" />
+    <option name="totallyTimeSpent" value="8667000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="820" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15379113" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15379113" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -212,7 +211,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.25686812" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.25686812" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="bottom" id="Messages" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -303,24 +302,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/map.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2261">
-          <caret line="119" column="43" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="929" column="32" selection-start-line="929" selection-start-column="32" selection-end-line="929" selection-end-column="39" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="327">
@@ -331,10 +312,28 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/echarts_map_test 1.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="168" column="32" lean-forward="true" selection-start-line="166" selection-start-column="12" selection-end-line="168" selection-end-column="32" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/map.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="458" column="32" selection-start-line="458" selection-start-column="32" selection-end-line="458" selection-end-column="32" />
+        <state relative-caret-position="7372">
+          <caret line="388" column="24" selection-start-line="388" selection-start-column="24" selection-end-line="388" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/map.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-505">
+          <caret line="367" column="86" lean-forward="true" selection-start-line="367" selection-start-column="35" selection-end-line="367" selection-end-column="86" />
         </state>
       </provider>
     </entry>
diff --git a/js/map.js b/js/map.js
index 5512c48..7ff720e 100644
--- a/js/map.js
+++ b/js/map.js
@@ -188,7 +188,10 @@ var geoCoordMap = {
   "菏泽":[115.480656,35.23375],
   "合肥":[117.27,31.86],
   "武汉":[114.31,30.52],
-  "大庆":[125.03,46.58]
+  "大庆":[125.03,46.58],
+  "班公湖": [78.744718,33.670094],
+  "洞朗": [88.951476,27.298102],
+  "桑多河谷":[92.21,26.97]
 };
 
 var data = [
@@ -381,7 +384,10 @@ var data = [
   {name: "菏泽", value: 194},
   {name: "合肥", value: 229},
   {name: "武汉", value: 273},
-  {name: "大庆", value: 279}
+  {name: "大庆", value: 279},
+  {name: "班公湖", value: 300},
+  {name: "洞朗", value: 210},
+  {name: "桑多河谷", value: 200}
 ];
 
 var convertData = function (data) {