Commit eb32304
committed
Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript
File tree
14 files changed
+122
-157
lines changed- dist/mapboxgl
- examples/mapboxgl
- src
- mapboxgl/overlay
- openlayers/core/colors_picker_util
14 files changed
+122
-157
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
48 | 52 | | |
49 | 53 | | |
50 | 54 | | |
51 | 55 | | |
52 | 56 | | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | 60 | | |
76 | 61 | | |
77 | 62 | | |
| |||
69250 | 69235 | | |
69251 | 69236 | | |
69252 | 69237 | | |
69253 | | - | |
| 69238 | + | |
69254 | 69239 | | |
69255 | 69240 | | |
69256 | 69241 | | |
| |||
69448 | 69433 | | |
69449 | 69434 | | |
69450 | 69435 | | |
69451 | | - | |
69452 | 69436 | | |
69453 | 69437 | | |
69454 | 69438 | | |
| |||
69484 | 69468 | | |
69485 | 69469 | | |
69486 | 69470 | | |
69487 | | - | |
| 69471 | + | |
69488 | 69472 | | |
69489 | 69473 | | |
69490 | 69474 | | |
| |||
69521 | 69505 | | |
69522 | 69506 | | |
69523 | 69507 | | |
69524 | | - | |
| 69508 | + | |
69525 | 69509 | | |
69526 | 69510 | | |
69527 | 69511 | | |
| |||
69842 | 69826 | | |
69843 | 69827 | | |
69844 | 69828 | | |
| 69829 | + | |
| 69830 | + | |
69845 | 69831 | | |
69846 | 69832 | | |
69847 | 69833 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
48 | 52 | | |
49 | 53 | | |
50 | 54 | | |
51 | 55 | | |
52 | 56 | | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | 60 | | |
76 | 61 | | |
77 | 62 | | |
| |||
58940 | 58925 | | |
58941 | 58926 | | |
58942 | 58927 | | |
58943 | | - | |
| 58928 | + | |
58944 | 58929 | | |
58945 | 58930 | | |
58946 | 58931 | | |
| |||
59151 | 59136 | | |
59152 | 59137 | | |
59153 | 59138 | | |
59154 | | - | |
59155 | 59139 | | |
59156 | 59140 | | |
59157 | 59141 | | |
| |||
59190 | 59174 | | |
59191 | 59175 | | |
59192 | 59176 | | |
59193 | | - | |
| 59177 | + | |
59194 | 59178 | | |
59195 | 59179 | | |
59196 | 59180 | | |
| |||
59232 | 59216 | | |
59233 | 59217 | | |
59234 | 59218 | | |
59235 | | - | |
| 59219 | + | |
59236 | 59220 | | |
59237 | 59221 | | |
59238 | 59222 | | |
| |||
59599 | 59583 | | |
59600 | 59584 | | |
59601 | 59585 | | |
| 59586 | + | |
| 59587 | + | |
59602 | 59588 | | |
59603 | 59589 | | |
59604 | 59590 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| |||
0 commit comments