Commit 6c66d219e4742d0a8f5dd9cf70e756746e4b5a2c
Merge code from production
| | | | 216 | }); | 216 | }); |
---|
217 | | 217 | |
---|
218 | | 218 | |
---|
219 | addLabel('3759.0000','-1274.33337','Face'); | | addLabel('3759.0000','-1274.33337','Face'); |
---|
| | 219 | /*addLabel('3759.0000','-1274.33337','Face'); | 220 | addLabel('3719','-1771','Jewelery'); | 220 | addLabel('3719','-1771','Jewelery'); |
---|
221 | addLabel('4263.0000','-1345.33337', 'Video'); | 221 | addLabel('4263.0000','-1345.33337', 'Video'); |
---|
222 | | 222 | |
---|
… | | … | |
---|
233 | | 233 | |
---|
234 | box = new OpenLayers.Feature.Vector(bounds.toGeometry()); | 234 | box = new OpenLayers.Feature.Vector(bounds.toGeometry()); |
---|
235 | box3.addFeatures(box); | 235 | box3.addFeatures(box); |
---|
236 | } | | } |
---|
| | 236 | }*/ | 237 | | 237 | |
---|
238 | } | 238 | } |
---|
239 | boxes = new OpenLayers.Layer.Vector( "Boxes" ); | 239 | boxes = new OpenLayers.Layer.Vector( "Boxes" ); |
---|
… | | … | |
---|
473 | }); | 473 | }); |
---|
474 | } | 474 | } |
---|
475 | var config = { | 475 | var config = { |
---|
476 | 'postTweetUrl':'http://192.168.100.14:5001', | | 'postTweetUrl':'http://192.168.100.14:5001', |
---|
477 | 'indexer':'http://localhost:5000' | | 'indexer':'http://localhost:5000' |
---|
| | 476 | 'postTweetUrl':'http://demo.swtr.us/add', | | | 477 | 'indexer':'http://folkhampi.openrun.net/mural-annotation' |
---|
478 | } | 478 | } |
---|