Skip to content

Commit 7626ce3

Browse files
mmarconmmarcon
committed
Merge branch 'tirejs'
2 parents d9aa8a9 + bd4d247 commit 7626ce3

File tree

5 files changed

+436
-3
lines changed

5 files changed

+436
-3
lines changed

‎.jshintrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"globals": {
44
"jQuery": true,
55
"nokia": true,
6-
"Zepto": true
6+
"Zepto": true,
7+
"tire": true
78
},
89

910
"browser": true,

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@ RUNNER = test/SpecRunner.html
88
deps:
99
@npm install
1010

11-
dist: hint plugin zepto extensions summary
11+
dist: hint plugin zepto tire extensions summary
1212

1313
plugin:
1414
@./node_modules/.bin/uglifyjs -nc -o dist/$(PLUGIN).min.js src/$(PLUGIN).js
1515

1616
zepto:
1717
@./node_modules/.bin/uglifyjs -nc -o dist/zepto.adapter.min.js src/zepto.adapter.js
1818

19+
tire:
20+
@./node_modules/.bin/uglifyjs -nc -o dist/tire.adapter.min.js src/tire.adapter.js
21+
1922
extensions:
2023
@./build-scripts/build-extensions.sh
2124

@@ -35,4 +38,4 @@ website: doc
3538
test: deps
3639
@sed 's/\/\*\*\*_\*\*\*\//$(INJECTORS)/g' src/$(PLUGIN).js > $(TESTED_CODE); \
3740
command -v phantomjs >/dev/null 2>&1 || { echo >&2 "PhantomJS not installed. Run the tests from the browser."; exit 0; }; \
38-
./node_modules/.bin/phantom-jasmine $(RUNNER)
41+
./node_modules/.bin/phantom-jasmine $(RUNNER)

‎dist/tire.adapter.min.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/examples/example.tire.html‎

Lines changed: 295 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,295 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>HTML5 boilerplate—all you really need…</title>
6+
<style>
7+
#map {
8+
position: absolute;
9+
top: 0;
10+
left: 0;
11+
bottom: 0;
12+
right: 0;
13+
background: white;
14+
}
15+
</style>
16+
</head>
17+
18+
<body>
19+
<div id="map"></div>
20+
<script type="text/javascript" src="http://lab.marcon.me/jhere/tire.js"></script>
21+
<script type="text/javascript" src="../tire.adapter.js"></script>
22+
<!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> -->
23+
<script type="text/javascript" src="../jhere.js"></script>
24+
<script type="text/javascript">
25+
var heatMapData = [
26+
{
27+
"value": 4899,
28+
"latitude": 52.53026126658807,
29+
"longitude": 13.385298362512387
30+
},
31+
{
32+
"value": 3299,
33+
"latitude": 52.530712612721196,
34+
"longitude": 13.385059833526611
35+
},
36+
{
37+
"value": 36,
38+
"latitude": 52.530215905734003,
39+
"longitude": 13.38543057664563
40+
},
41+
{
42+
"value": 680,
43+
"latitude": 52.530870437622099,
44+
"longitude": 13.3849096298218
45+
},
46+
{
47+
"value": 289,
48+
"latitude": 52.530234520737004,
49+
"longitude": 13.385648693847036
50+
},
51+
{
52+
"value": 27,
53+
"latitude": 52.530488537560281,
54+
"longitude": 13.385252371995787
55+
},
56+
{
57+
"value": 38,
58+
"latitude": 52.530063626141377,
59+
"longitude": 13.385473500409793
60+
},
61+
{
62+
"value": 89,
63+
"latitude": 52.530244890211264,
64+
"longitude": 13.385788119172863
65+
},
66+
{
67+
"value": 6,
68+
"latitude": 52.530253983437007,
69+
"longitude": 13.385760004534591
70+
},
71+
{
72+
"value": 164,
73+
"latitude": 52.529855659002003,
74+
"longitude": 13.384268417202721
75+
},
76+
{
77+
"value": 687,
78+
"latitude": 52.529975,
79+
"longitude": 13.383993
80+
},
81+
{
82+
"value": 1347,
83+
"latitude": 52.529565942430487,
84+
"longitude": 13.384504666194712
85+
},
86+
{
87+
"value": 34,
88+
"latitude": 52.530347321620944,
89+
"longitude": 13.385677040788089
90+
},
91+
{
92+
"value": 184,
93+
"latitude": 52.530878000000001,
94+
"longitude": 13.384904000000001
95+
},
96+
{
97+
"value": 172,
98+
"latitude": 52.529768647948352,
99+
"longitude": 13.384791244138654
100+
},
101+
{
102+
"value": 479,
103+
"latitude": 52.530803986958468,
104+
"longitude": 13.387076854705811
105+
},
106+
{
107+
"value": 128,
108+
"latitude": 52.530900000000003,
109+
"longitude": 13.3847
110+
},
111+
{
112+
"value": 17,
113+
"latitude": 52.529969969813301,
114+
"longitude": 13.385131331173101
115+
},
116+
{
117+
"value": 18,
118+
"latitude": 52.530900000000003,
119+
"longitude": 13.3849
120+
},
121+
{
122+
"value": 3,
123+
"latitude": 52.530006959735175,
124+
"longitude": 13.385183469129728
125+
},
126+
{
127+
"value": 169,
128+
"latitude": 52.529605748442059,
129+
"longitude": 13.384814799655908
130+
},
131+
{
132+
"value": 308,
133+
"latitude": 52.530434197093939,
134+
"longitude": 13.385883058015915
135+
},
136+
{
137+
"value": 71,
138+
"latitude": 52.530757000000001,
139+
"longitude": 13.384383
140+
},
141+
{
142+
"value": 716,
143+
"latitude": 52.530304999999998,
144+
"longitude": 13.383474319999999
145+
},
146+
{
147+
"value": 7,
148+
"latitude": 52.530581520484056,
149+
"longitude": 13.386184774537549
150+
},
151+
{
152+
"value": 3,
153+
"latitude": 52.530765175608799,
154+
"longitude": 13.384771001626588
155+
},
156+
{
157+
"value": 297,
158+
"latitude": 52.530719317584662,
159+
"longitude": 13.383554065723375
160+
},
161+
{
162+
"value": 687,
163+
"latitude": 52.530542917204741,
164+
"longitude": 13.383557796478271
165+
},
166+
{
167+
"value": 13,
168+
"latitude": 52.530131948860614,
169+
"longitude": 13.386342364840072
170+
},
171+
{
172+
"value": 5,
173+
"latitude": 52.530000000000001,
174+
"longitude": 13.3851
175+
},
176+
{
177+
"value": 68,
178+
"latitude": 52.530712612721196,
179+
"longitude": 13.384780883789062
180+
},
181+
{
182+
"value": 21,
183+
"latitude": 52.530496999999997,
184+
"longitude": 13.385122349999998
185+
},
186+
{
187+
"value": 210,
188+
"latitude": 52.529994665670216,
189+
"longitude": 13.38409423828125
190+
},
191+
{
192+
"value": 5,
193+
"latitude": 52.530973479671822,
194+
"longitude": 13.3848509841156
195+
},
196+
{
197+
"value": 220,
198+
"latitude": 52.529781999999997,
199+
"longitude": 13.38395
200+
},
201+
{
202+
"value": 212,
203+
"latitude": 52.530653999999998,
204+
"longitude": 13.383659
205+
},
206+
{
207+
"value": 56,
208+
"latitude": 52.530817064808303,
209+
"longitude": 13.383900201050393
210+
},
211+
{
212+
"value": 88,
213+
"latitude": 52.530654962765965,
214+
"longitude": 13.383485390706522
215+
},
216+
{
217+
"value": 19,
218+
"latitude": 52.530841000000002,
219+
"longitude": 13.384907999999999
220+
},
221+
{
222+
"value": 7,
223+
"latitude": 52.530961968053603,
224+
"longitude": 13.384805275139801
225+
},
226+
{
227+
"value": 376,
228+
"latitude": 52.529297467355825,
229+
"longitude": 13.384428562870935
230+
},
231+
{
232+
"value": 824,
233+
"latitude": 52.529055867792856,
234+
"longitude": 13.385228922324478
235+
},
236+
{
237+
"value": 25,
238+
"latitude": 52.530738935100189,
239+
"longitude": 13.38375270869002
240+
},
241+
{
242+
"value": 157,
243+
"latitude": 52.530112148718082,
244+
"longitude": 13.383579254150391
245+
},
246+
{
247+
"value": 44,
248+
"latitude": 52.530441122208984,
249+
"longitude": 13.386257713051902
250+
},
251+
{
252+
"value": 32,
253+
"latitude": 52.529431550962173,
254+
"longitude": 13.384827986540591
255+
},
256+
{
257+
"value": 235,
258+
"latitude": 52.530798030550265,
259+
"longitude": 13.383918592731648
260+
},
261+
{
262+
"value": 211,
263+
"latitude": 52.529138000000003,
264+
"longitude": 13.384971
265+
},
266+
{
267+
"value": 41,
268+
"latitude": 52.531100735356837,
269+
"longitude": 13.386037485323744
270+
},
271+
{
272+
"value": 28,
273+
"latitude": 52.529808973752715,
274+
"longitude": 13.383999001205726
275+
}
276+
];
277+
</script>
278+
<script type="text/javascript">
279+
$(window).on('load', function(){
280+
//Set default credentials
281+
$.jHERE.defaultCredentials('_peU-uCkp-j8ovkzFGNU', 'gBoUkAMoxoqIWfxWA5DuMQ');
282+
283+
$('#map').jHERE({enable: ['behavior', 'zoombar', 'typeselector', 'positioning', 'contextmenu']});
284+
$('#map').jHERE('type', 'smart').jHERE('marker', [52.49, 13.37], {text: '●', textColor: '#fff', fill: '#004C9A',
285+
click: function(e){
286+
alert(JSON.stringify(e.geo));
287+
}}).jHERE('marker', [52.49, 13.39], {text: '❤', textColor: '#fff', fill: '#004C9A',
288+
click: function(e){
289+
$(this).jHERE('bubble', [52.49, 13.39], {content: JSON.stringify(e.geo), closable: false});
290+
}}).jHERE('heatmap', heatMapData, 'value');
291+
$('#map').jHERE('kml', 'resources/berlin.kml', true);
292+
});
293+
</script>
294+
</body>
295+
</html>

0 commit comments

Comments
 (0)