gistfile1.txt

benheb@benheb:~/geocommons/geoiq$ git branch
  9323_twitch_maps
* andrew-ontrack3
  benheb-ontrack
  benheb_twitch
  benheb_twitch_uibk
  master
  master_benheb
  master_bug_fixes
benheb@benheb:~/geocommons/geoiq$ git merge master
Auto-merging geoiq/lib/twitch/adapters/mongo.js
Merge made by recursive.
 geoiq/app/controllers/copies_controller.rb         |    2 +-
 geoiq/app/controllers/maps_controller.rb           |    2 +-
 geoiq/app/controllers/tiles_controller.rb          |   11 +-
 geoiq/app/models/dataset/dataset_ogr_export.rb     |   65 ++--
 geoiq/app/models/dataset/dataset_preview_map.rb    |   27 +-
 geoiq/app/models/dataset/dataset_raster.rb         |    7 +-
 geoiq/app/models/dataset/dataset_states.rb         |    4 +-
 geoiq/app/models/layer.rb                          |    9 +-
 geoiq/app/models/map.rb                            |    3 +-
 geoiq/app/models/map_module/map_preview_map.rb     |   11 +-
 geoiq/app/models/mongo_data_store.rb               |    4 +
 geoiq/app/models/overlay.rb                        |    2 +-
 .../twitch_aggregation_refinement.rb               |    4 +-
 geoiq/app/models/search.rb                         |    6 +-
 geoiq/app/models/search_module/search_refiner.rb   |   16 +-
 geoiq/app/models/sql_data_store.rb                 |   36 +-
 geoiq/app/models/tile_maker.rb                     |   16 +-
 .../models/tile_maker/external_data_connection.rb  |   38 ++-
 geoiq/app/models/tile_maker/icons.rb               |   95 ++++
 geoiq/app/models/tile_maker/mapnik_2_interface.rb  |  177 +++-----
 geoiq/app/models/tile_maker/zoom_filter.rb         |   96 ++++
 geoiq/app/views/common/_item_groups.html.erb       |   11 +-
 geoiq/app/views/configurations/edit.html.erb       |    1 +
 geoiq/app/views/home/api.js.erb                    |    8 +-
 geoiq/app/views/layouts/full_flash.html.erb        |    4 +-
 geoiq/app/views/maps/show.html.erb                 |   20 +
 geoiq/app/views/overlays/_show_heading.html.erb    |    4 +-
 geoiq/config/config_defaults.yml                   |    5 +
 geoiq/config/deploy.rb                             |    9 +
 geoiq/config/deploy/saas_production.rb             |    2 +-
 geoiq/config/deploy/saas_staging.rb                |    2 +-
 geoiq/config/initializers/01_platform_config.rb    |    2 +-
 geoiq/config/initializers/assets.rb                |    3 +
 geoiq/config/initializers/temp_directories.rb      |    3 +-
 geoiq/lib/extensions/active_record_extensions.rb   |   63 +++-
 geoiq/lib/f1/core/datasource_data_conversion.rb    |    2 +-
 geoiq/lib/overlay_adapter/adapters/xml_adapter.rb  |   27 +-
 geoiq/lib/tasks/test.rake                          |   51 ++-
 geoiq/lib/tasks/tiles.rake                         |   64 +++
 geoiq/lib/temporary_file.rb                        |    8 +-
 geoiq/lib/twitch/adapters/{mongodb.js => mongo.js} |   12 +-
 geoiq/lib/twitch/adapters/mysql.js                 |    2 +-
 geoiq/lib/twitch/adapters/oracle.js                |    3 +-
 geoiq/lib/twitch/aggregator.js                     |   25 +-
 geoiq/lib/twitch/app.js                            |   85 ++--
 geoiq/lib/twitch/config.yml                        |    5 +-
 geoiq/lib/twitch/indexer.js                        |   49 +--
 geoiq/lib/twitch/spa.js                            |   19 +-
 geoiq/lib/twitch/test/adapters/test-mongo.js       |    6 +-
 geoiq/lib/twitch/test/vows-indexer-test.js         |   10 +-
 geoiq/lib/twitch/workers/worker_bee.js             |  499 +++++++++++---------
 geoiq/public/images/twitch.embed_play.png          |  Bin 3923 -> 7871 bytes
 geoiq/public/javascripts/bambu.js                  |    4 +-
 geoiq/public/javascripts/f1.errors.js              |    2 +-
 geoiq/public/javascripts/f1.expert.js              |   27 +-
 geoiq/public/javascripts/f1.expert.loader.js       |   49 +--
 geoiq/public/javascripts/f1.flash.loader.js        |   11 +-
 geoiq/public/javascripts/f1.groups.js              |   12 +-
 geoiq/public/javascripts/f1.infowindow.js          |   44 +-
 geoiq/public/javascripts/f1.jquery.dropdown.js     |    7 +-
 geoiq/public/javascripts/f1.js.loader.js           |    4 +
 geoiq/public/javascripts/f1.layers.js              |  141 +++---
 geoiq/public/javascripts/f1.legend.js              |   18 +-
 geoiq/public/javascripts/f1.maker.map.js           |   55 ++-
 geoiq/public/javascripts/f1.maker.visualizer.js    |   10 +-
 geoiq/public/javascripts/f1.map.loader.js          |    6 +-
 geoiq/public/javascripts/f1.map_handler.js         |    7 +-
 geoiq/public/javascripts/f1.map_start.js           |  102 ++--
 geoiq/public/javascripts/f1.overlay_grid.js        |   18 +-
 geoiq/public/javascripts/f1.panel.js               |   65 +++-
 geoiq/public/javascripts/f1.poller.js              |    4 +-
 geoiq/public/javascripts/f1.stylist.color.js       |    2 +-
 geoiq/public/javascripts/f1.stylist.infowin.js     |   32 +-
 geoiq/public/javascripts/f1.stylist.js             |   14 +-
 geoiq/public/javascripts/f1.twitch.embed.js        |    3 +
 geoiq/public/javascripts/f1.twitch.ui.js           |   68 ++-
 geoiq/public/javascripts/f1.zoom.js                |   10 +-
 geoiq/public/javascripts/maker.js                  |    1 -
 geoiq/public/javascripts/modestmaps/mm.layer.js    |  181 ++++----
 geoiq/public/javascripts/vecnik/model.js           |   24 +-
 .../public/javascripts/vecnik/tilejson.provider.js |    6 +-
 geoiq/public/robots.txt                            |    5 +-
 geoiq/public/stylesheets/f1.css                    |   13 +-
 geoiq/public/stylesheets/f1.infowindow.css         |    3 +-
 geoiq/public/stylesheets/f1.layers_zoom_legend.css |   15 +-
 geoiq/public/stylesheets/f1.palettes.css           |   83 +++-
 geoiq/public/stylesheets/f1.twitch.embed.css       |   19 +-
 .../test/automation/selenium/geoic/failed_tests.sh |    2 +
 geoiq/test/automation/selenium/geoic/lib/util.rb   |   65 +++-
 geoiq/test/automation/selenium/geoic/run_tests.sh  |    7 +
 .../geoic/test_GI-1106_interact_feature_map.rb     |   20 +-
 ...9_nasa_acetate_openstreetmap_terrain_basemap.rb |  234 +++++++++
 .../selenium/geoic/test_GI-1144_domain_group.rb    |  138 ++----
 .../geoic/test_GI-1166_profile_new_user.rb         |   20 +-
 .../geoic/test_GI-1170_sign_up_subdomain.rb        |   81 ++--
 .../test_GI-1171_create_duplicate_subdomain.rb     |    3 +
 ...I-1172_dataset_permission_everyone_subdomain.rb |   50 ++-
 .../geoic/test_GI-1173_delete_group_subdomain.rb   |    4 +
 ...st_GI-1174_everyone_permission_map_subdomain.rb |   23 +-
 ...t_GI-1176_dataset_permission_group_subdomain.rb |   96 +++-
 .../geoic/test_GI-1181_admin_remove_themselves.rb  |   10 +-
 .../geoic/test_GI-1182_dataset_with_zipcode.rb     |   29 +-
 ...GI-1187_manual_break_previous_classification.rb |  129 +++++
 .../selenium/geoic/test_GI-11_locate_lat_lon.rb    |   49 +-
 .../selenium/geoic/test_GI-13_Geojoin.rb           |   50 +--
 .../geoic/test_GI-15_existing_geographic.rb        |   92 ++++
 .../geoic/test_GI-177_simplify_analysis.rb         |   99 ++---
 .../geoic/test_GI-18_search_layer_map_by_name.rb   |  110 ++---
 .../geoic/test_GI-19_search_another_server.rb      |   66 ++-
 .../selenium/geoic/test_GI-1_sign_up_config.rb     |   65 ++--
 .../geoic/test_GI-226_substraction_analysis_kml.rb |   17 +-
 .../test_GI-310_search_layer_map_by_description.rb |   30 +-
 .../geoic/test_GI-311_search_layer_by_source.rb    |    8 +-
 .../geoic/test_GI-345_user_total_increased.rb      |   13 +-
 .../test_GI-346_user_total_signup_increased.rb     |   15 +-
 .../geoic/test_GI-347_user_remove_statistic.rb     |   11 +-
 ...-350_add_existing_tag_check_admin_statistics.rb |    2 +
 .../selenium/geoic/test_GI-379_strong_password.rb  |  204 ++++++++
 .../selenium/geoic/test_GI-3_create_new_user.rb    |   17 +-
 .../geoic/test_GI-446_all_permissions_to_group.rb  |   12 +-
 .../selenium/geoic/test_GI-49_unique_name.rb       |   30 +-
 .../selenium/geoic/test_GI-4_create_group.rb       |   14 +-
 ...I-582_search_layer_map_at_search_result_page.rb |   58 ++-
 ..._GI-583_search_layer_map_at_top_right_corner.rb |   67 ++--
 ...est_GI-584_search_layer_map_approximate_name.rb |   64 ++--
 .../selenium/geoic/test_GI-5_add_user_to_group.rb  |   19 +-
 .../selenium/geoic/test_GI-75_delete_row.rb        |   26 +-
 .../selenium/geoic/test_GI-77_delete_all_row.rb    |   20 +-
 .../selenium/geoic/test_GI-78_delete_column.rb     |   23 +-
 .../geoic/test_GI-7_add_description_to_map.rb      |   14 +-
 .../selenium/geoic/test_GI-8_add_tag_to_map.rb     |   14 +-
 .../test_GI-972_feature_map_from_details_page.rb   |   13 +-
 .../geoic/test_GI-974_feature_map_from_admin.rb    |   46 +-
 ...st_GI-9_set_edit_permission_dataset_everyone.rb |   14 +-
 geoiq/test/functional/copies_controller_test.rb    |   11 +
 geoiq/test/functional/layers_controller_test.rb    |    2 +-
 geoiq/test/functional/overlays_controller_test.rb  |    4 +-
 geoiq/test/functional/tiles_controller_test.rb     |   72 ++--
 geoiq/test/helpers/factory.rb                      |    2 +-
 .../test/performance/spatialite_generation_test.rb |    8 +-
 geoiq/test/unit/map_test.rb                        |    3 +
 geoiq/test/unit/map_to_mml_converter_test.rb       |    4 +-
 .../twitch_aggregation_refinement_test.rb          |   27 +
 geoiq/test/unit/sql_data_store_test.rb             |  177 +++++---
 .../unit/tile_maker/mapnik_2_interface_test.rb     |   51 ++-
 geoiq/test/unit/tile_maker/zoom_filter_test.rb     |   86 ++++
 geoiq/test/unit/tile_maker_test.rb                 |   23 +
 147 files changed, 3528 insertions(+), 1835 deletions(-)
 create mode 100644 geoiq/app/models/tile_maker/icons.rb
 create mode 100644 geoiq/app/models/tile_maker/zoom_filter.rb
 rename geoiq/lib/twitch/adapters/{mongodb.js => mongo.js} (80%)
 create mode 100755 geoiq/test/automation/selenium/geoic/failed_tests.sh
 create mode 100755 geoiq/test/automation/selenium/geoic/test_GI-1109_nasa_acetate_openstreetmap_terrain_basemap.rb
 mode change 100644 => 100755 geoiq/test/automation/selenium/geoic/test_GI-1181_admin_remove_themselves.rb
 create mode 100755 geoiq/test/automation/selenium/geoic/test_GI-1187_manual_break_previous_classification.rb
 create mode 100755 geoiq/test/automation/selenium/geoic/test_GI-15_existing_geographic.rb
 create mode 100755 geoiq/test/automation/selenium/geoic/test_GI-379_strong_password.rb
 create mode 100644 geoiq/test/unit/tile_maker/zoom_filter_test.rb
benheb@benheb:~/geocommons/geoiq$