Skip to content

Commit

Permalink
🤝 merge gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
chfw committed Dec 29, 2017
2 parents 067f8bd + cd68e1c commit 9356cd2
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://travis-ci.org/pyecharts/echarts-china-cities-js.svg?branch=master)](https://travis-ci.org/pyecharts/echarts-china-cities-js) [![npm version](https://badge.fury.io/js/echarts-china-cities-js.svg)](https://badge.fury.io/js/echarts-china-cities-js)

It collects all geo-jsons in javascript of all 363 provincial cities
It collects all geo-jsons in javascript of all 364 provincial cities
in 27 provinces and acts as a static asset to jupyter-echarts or your
echarts collection.

Expand Down Expand Up @@ -74,7 +74,7 @@ Cities:
8. **河北**:
[保定](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/bao3_ding4.js), [承德](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/cheng2_de2.js), [邯郸](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/han2_dan1.js), [衡水](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/heng2_shui3.js), [廊坊](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/lang2_fang1.js), [秦皇岛](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/qin2_huang2_dao3.js), [石家庄](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/shi2_jia1_zhuang1.js), [唐山](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/tang2_shan1.js), [邢台](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/xing2_tai2.js), [张家口](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_bei3/zhang1_jia1_kou3.js)
9. **河南**:
[安阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/an1_yang2.js), [鹤壁](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/he4_bi4.js), [济源](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/ji4_yuan2.js), [焦作](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/jiao1_zuo4.js), [开封](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/kai1_feng1.js), [洛阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/luo4_yang2.js), [南阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/nan2_yang2.js), [平顶山](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/ping2_ding3_shan1.js), [濮阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/pu2_yang2.js), [三门峡](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/san1_men2_xia2.js), [商丘](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/shang1_qiu1.js), [漯河](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/ta4_he2.js), [新乡](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/xin1_xiang1.js), [信阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/xin4_yang2.js), [许昌](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/xu3_chang1.js), [郑州](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/zheng4_zhou1.js), [周口](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/zhou1_kou3.js), [驻马店](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/zhu4_ma3_dian4.js)
[安阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/an1_yang2.js), [沧州](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/cang1_zhou1.js), [鹤壁](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/he4_bi4.js), [济源](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/ji4_yuan2.js), [焦作](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/jiao1_zuo4.js), [开封](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/kai1_feng1.js), [洛阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/luo4_yang2.js), [南阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/nan2_yang2.js), [平顶山](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/ping2_ding3_shan1.js), [濮阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/pu2_yang2.js), [三门峡](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/san1_men2_xia2.js), [商丘](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/shang1_qiu1.js), [漯河](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/ta4_he2.js), [新乡](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/xin1_xiang1.js), [信阳](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/xin4_yang2.js), [许昌](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/xu3_chang1.js), [郑州](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/zheng4_zhou1.js), [周口](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/zhou1_kou3.js), [驻马店](https://pyecharts.github.io/echarts-china-cities-js/dist/he2_nan2/zhu4_ma3_dian4.js)
10. **黑龙江**:
[大庆](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/da4_qing4.js), [大兴安岭地区](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/da4_xing1_an1_ling2_di4_qu1.js), [哈尔滨](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/ha1_er3_bin1.js), [鹤岗](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/he4_gang3.js), [黑河](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/hei1_he2.js), [鸡西](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/ji1_xi1.js), [佳木斯](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/jia1_mu4_si1.js), [牡丹江](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/mu3_dan1_jiang1.js), [七台河](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/qi1_tai2_he2.js), [齐齐哈尔](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/qi2_qi2_ha1_er3.js), [双鸭山](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/shuang1_ya1_shan1.js), [绥化](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/sui1_hua4.js), [伊春](https://pyecharts.github.io/echarts-china-cities-js/dist/hei1_long2_jiang1/yi1_chun1.js)
11. **湖北**:
Expand Down
2 changes: 2 additions & 0 deletions dist/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
, "邢台": "xing2_tai2"
, "张家口": "zhang1_jia1_kou3"
, "安阳": "an1_yang2"
, "沧州": "cang1_zhou1"
, "鹤壁": "he4_bi4"
, "济源": "ji4_yuan2"
, "焦作": "jiao1_zuo4"
Expand Down Expand Up @@ -479,6 +480,7 @@
, "xing2_tai2": "he2_bei3/xing2_tai2.js"
, "zhang1_jia1_kou3": "he2_bei3/zhang1_jia1_kou3.js"
, "an1_yang2": "he2_nan2/an1_yang2.js"
, "cang1_zhou1": "he2_nan2/cang1_zhou1.js"
, "he4_bi4": "he2_nan2/he4_bi4.js"
, "ji4_yuan2": "he2_nan2/ji4_yuan2.js"
, "jiao1_zuo4": "he2_nan2/jiao1_zuo4.js"
Expand Down
2 changes: 2 additions & 0 deletions dist/he2_nan2/cang1_zhou1.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<!DOCTYPE html>
<html>
<head>
<title>echarts-china-cities-js</title>
<!-- Place this tag in your head or just before your close body tag. -->
<script async defer src="https://buttons.github.io/buttons.js"></script>
<style>

html, body {
height: 100%;
margin: 0;
padding: 0;
width: 100%;
}

body {
display: table;
background-image: url("wallpaper.jpg");
background-repeat: no-repeat;
background-position: left top;
background-attachment: fixed;
}

.my-block {
text-align: center;
display: table-cell;
vertical-align: middle;
}
.big {
font-size: 68px;
color:white;
}
.medium{
font-size: 32px;
color:white;
}
.inner-block{
background: rgb(54, 54, 54); /* The Fallback */
background: rgba(54, 54, 54, 0.5);
}
a {
color:white;
}
</style>
</head>
<body>
<a href="https://github.com/pyecharts/echarts-china-cities-js"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
<div class="my-block">
<div class="inner-block">
<span class="big"><a href="preview.html">Preview</a> 363 Chinese city maps (12MB in total)</span><p>
<a class="github-button" href="https://github.com/pyecharts/echarts-china-cities-js/fork" data-icon="octicon-repo-forked" data-size="large" data-show-count="true" aria-label="Fork pyecharts/echarts-china-cities-js on GitHub">Fork</a>
<a class="github-button" href="https://github.com/pyecharts/echarts-china-cities-js" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star pyecharts/echarts-china-cities-js on GitHub">Star</a><p>
<span class="medium">https://github.com/pyecharts/echarts-china-cities-js</span>

</div>
</div>
</body>
</html>
13 changes: 8 additions & 5 deletions preview.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!Doctype html>
<html>
<head>
<title>363 Chinese provincial cities Map Demo</title>
<title>364 Chinese provincial cities Map Demo</title>
<meta charset="utf-8" />
<style>
.citymap{
Expand Down Expand Up @@ -136,6 +136,7 @@
<script src="dist/he2_bei3/zhang1_jia1_kou3.js"></script>
<!-- 河南 -->
<script src="dist/he2_nan2/an1_yang2.js"></script>
<script src="dist/he2_nan2/cang1_zhou1.js"></script>
<script src="dist/he2_nan2/he4_bi4.js"></script>
<script src="dist/he2_nan2/ji4_yuan2.js"></script>
<script src="dist/he2_nan2/jiao1_zuo4.js"></script>
Expand Down Expand Up @@ -587,25 +588,26 @@ <h2>河南 - he2_nan2</h2>
<table>
<tr>
<td><div id="an1_yang2" class="citymap"></div></td>
<td><div id="cang1_zhou1" class="citymap"></div></td>
<td><div id="he4_bi4" class="citymap"></div></td>
<td><div id="ji4_yuan2" class="citymap"></div></td>
<td><div id="jiao1_zuo4" class="citymap"></div></td>
</tr><tr>
<td><div id="jiao1_zuo4" class="citymap"></div></td>
<td><div id="kai1_feng1" class="citymap"></div></td>
<td><div id="luo4_yang2" class="citymap"></div></td>
<td><div id="nan2_yang2" class="citymap"></div></td>
<td><div id="ping2_ding3_shan1" class="citymap"></div></td>
</tr><tr>
<td><div id="ping2_ding3_shan1" class="citymap"></div></td>
<td><div id="pu2_yang2" class="citymap"></div></td>
<td><div id="san1_men2_xia2" class="citymap"></div></td>
<td><div id="shang1_qiu1" class="citymap"></div></td>
<td><div id="ta4_he2" class="citymap"></div></td>
</tr><tr>
<td><div id="ta4_he2" class="citymap"></div></td>
<td><div id="xin1_xiang1" class="citymap"></div></td>
<td><div id="xin4_yang2" class="citymap"></div></td>
<td><div id="xu3_chang1" class="citymap"></div></td>
<td><div id="zheng4_zhou1" class="citymap"></div></td>
</tr><tr>
<td><div id="zheng4_zhou1" class="citymap"></div></td>
<td><div id="zhou1_kou3" class="citymap"></div></td>
<td><div id="zhu4_ma3_dian4" class="citymap"></div></td>
</tr>
Expand Down Expand Up @@ -1109,6 +1111,7 @@ <h2>浙江 - zhe4_jiang1</h2>
make_city('张家口', 'zhang1_jia1_kou3');
<!-- 河南 -->
make_city('安阳', 'an1_yang2');
make_city('沧州', 'cang1_zhou1');
make_city('鹤壁', 'he4_bi4');
make_city('济源', 'ji4_yuan2');
make_city('焦作', 'jiao1_zuo4');
Expand Down
Loading

0 comments on commit 9356cd2

Please sign in to comment.