diff --git a/.gitignore b/.gitignore index b4ace1d..c4ef1a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,17 @@ +VectorTileMapGDX-html/gwt*/* +VectorTileMapGDX-html/war/* +VectorTileMapGDX-android/obj/* +VectorTileMap/backup/* +VectorTileMap/gen/* +VectorTileMap/obj/* +VectorTileMap/local.properties +VectorTileMap/reports/* +cVectorTileMap/* +TileMapApp/gen/* +TileMapApp/proguard/* +TileMapExample/gen/* +backup/* +VectorTileMap/proguard/* */target/* */bin/* */classes/ diff --git a/README b/README index 58e6844..dee2753 100644 --- a/README +++ b/README @@ -1,7 +1,4 @@ -VectorTileMap is a vector-tile map viewer currently developed at University of Bremen. -This application is based on mapsforge and extends it with an OpenGL renderer to enable -continuous scaling of the map view (http://code.google.com/p/mapsforge/). An additional -PostGIS backend is also under develpment which is intended to ease creation and -compilation of multi-resolution maps from different data sources. +Development moved to https://github.com/opensciencemap/vtm -precompiled binaries and maps are at http://code.google.com/p/vector-tile-map/downloads +VectorTileMap is part of the OpenScienceMap project, developed at University of Bremen. +http://www.opensciencemap.org diff --git a/TileMapApp/.classpath b/TileMapApp/.classpath new file mode 100644 index 0000000..4779948 --- /dev/null +++ b/TileMapApp/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/TileMapApp/.project b/TileMapApp/.project new file mode 100644 index 0000000..469c63f --- /dev/null +++ b/TileMapApp/.project @@ -0,0 +1,33 @@ + + + TileMapApp + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/TileMapApp/.settings/org.eclipse.jdt.core.prefs b/TileMapApp/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..fa8a6ac --- /dev/null +++ b/TileMapApp/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,281 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=false +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=100 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/TileMapApp/.settings/org.eclipse.jdt.ui.prefs b/TileMapApp/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000..3a3bc1f --- /dev/null +++ b/TileMapApp/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +formatter_profile=_vtm +formatter_settings_version=12 diff --git a/TileMapApp/AndroidManifest.xml b/TileMapApp/AndroidManifest.xml new file mode 100644 index 0000000..1b6c411 --- /dev/null +++ b/TileMapApp/AndroidManifest.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TileMapApp/COPYING.LESSER b/TileMapApp/COPYING.LESSER new file mode 100644 index 0000000..65c5ca8 --- /dev/null +++ b/TileMapApp/COPYING.LESSER @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/TileMapApp/assets/globe2.png b/TileMapApp/assets/globe2.png new file mode 100644 index 0000000..6d78802 Binary files /dev/null and b/TileMapApp/assets/globe2.png differ diff --git a/TileMapApp/assets/info.xml b/TileMapApp/assets/info.xml new file mode 100644 index 0000000..da058a4 --- /dev/null +++ b/TileMapApp/assets/info.xml @@ -0,0 +1,27 @@ + + + + + About this software + + + +


Version 0.4.9

+

+

  • OpenScienceMap is + distributed under the LGPL3. + Please report any bugs, problems or feature requests via our + issue tracker
  • +

    +

    +

  • This software contains fragments of mapsforge + library and osmdroid.
  • + +

  • Map data for 'OpenScienceMap' source © OpenStreetMap contributors + CC-BY-SA.
  • + +

  • Map data for 'OpenScienceMap2' source © OpenStreetMap contributors, + licensed under the Open Data Commons Open Database License (ODbL).
  • + + + \ No newline at end of file diff --git a/TileMapApp/libs/android-support-v4.jar b/TileMapApp/libs/android-support-v4.jar new file mode 100644 index 0000000..018c127 Binary files /dev/null and b/TileMapApp/libs/android-support-v4.jar differ diff --git a/TileMapApp/proguard-project.txt b/TileMapApp/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/TileMapApp/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/TileMapApp/proguard.cfg b/TileMapApp/proguard.cfg new file mode 100644 index 0000000..377d257 --- /dev/null +++ b/TileMapApp/proguard.cfg @@ -0,0 +1,43 @@ +-optimizationpasses 5 +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-dontskipnonpubliclibraryclassmembers +-dontpreverify +-verbose +-ignorewarnings + +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* + +-keep public class * extends android.app.Activity +-keep public class * extends android.app.Application +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class * extends android.app.backup.BackupAgentHelper +-keep public class * extends android.preference.Preference +-keep public class com.android.vending.licensing.ILicensingService + +-keepclasseswithmembernames class * { + native ; +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet); +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keep class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} diff --git a/TileMapApp/project.properties b/TileMapApp/project.properties new file mode 100644 index 0000000..f5b8fb2 --- /dev/null +++ b/TileMapApp/project.properties @@ -0,0 +1,16 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt +#proguard.config=proguard.cfg + +# Project target. +target=android-17 +android.library.reference.1=../../VectorTileMap/VectorTileMap diff --git a/TileMapApp/res/drawable-hdpi/ic_launcher.png b/TileMapApp/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..244f8b2 Binary files /dev/null and b/TileMapApp/res/drawable-hdpi/ic_launcher.png differ diff --git a/TileMapApp/res/drawable-ldpi/ic_launcher.png b/TileMapApp/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..68356cc Binary files /dev/null and b/TileMapApp/res/drawable-ldpi/ic_launcher.png differ diff --git a/TileMapApp/res/drawable-mdpi/bonuspack_bubble.9.png b/TileMapApp/res/drawable-mdpi/bonuspack_bubble.9.png new file mode 100644 index 0000000..31a2ba6 Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/bonuspack_bubble.9.png differ diff --git a/VectorTileMap/res/drawable-mdpi/btn_snap_normal.png b/TileMapApp/res/drawable-mdpi/btn_snap_normal.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/btn_snap_normal.png rename to TileMapApp/res/drawable-mdpi/btn_snap_normal.png diff --git a/VectorTileMap/res/drawable-mdpi/btn_snap_pressed.png b/TileMapApp/res/drawable-mdpi/btn_snap_pressed.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/btn_snap_pressed.png rename to TileMapApp/res/drawable-mdpi/btn_snap_pressed.png diff --git a/VectorTileMap/res/drawable-mdpi/btn_snap_selected.png b/TileMapApp/res/drawable-mdpi/btn_snap_selected.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/btn_snap_selected.png rename to TileMapApp/res/drawable-mdpi/btn_snap_selected.png diff --git a/TileMapApp/res/drawable-mdpi/delete.png b/TileMapApp/res/drawable-mdpi/delete.png new file mode 100644 index 0000000..7fca7db Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/delete.png differ diff --git a/TileMapApp/res/drawable-mdpi/delete_pressed.png b/TileMapApp/res/drawable-mdpi/delete_pressed.png new file mode 100644 index 0000000..bc2d71f Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/delete_pressed.png differ diff --git a/VectorTileMap/res/drawable-mdpi/file_picker_back.png b/TileMapApp/res/drawable-mdpi/file_picker_back.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/file_picker_back.png rename to TileMapApp/res/drawable-mdpi/file_picker_back.png diff --git a/VectorTileMap/res/drawable-mdpi/file_picker_file.png b/TileMapApp/res/drawable-mdpi/file_picker_file.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/file_picker_file.png rename to TileMapApp/res/drawable-mdpi/file_picker_file.png diff --git a/VectorTileMap/res/drawable-mdpi/file_picker_folder.png b/TileMapApp/res/drawable-mdpi/file_picker_folder.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/file_picker_folder.png rename to TileMapApp/res/drawable-mdpi/file_picker_folder.png diff --git a/TileMapApp/res/drawable-mdpi/ic_continue.png b/TileMapApp/res/drawable-mdpi/ic_continue.png new file mode 100644 index 0000000..50a54e0 Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/ic_continue.png differ diff --git a/TileMapApp/res/drawable-mdpi/ic_empty.png b/TileMapApp/res/drawable-mdpi/ic_empty.png new file mode 100644 index 0000000..7e162eb Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/ic_empty.png differ diff --git a/TileMapApp/res/drawable-mdpi/ic_launcher.png b/TileMapApp/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..bf571d6 Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/ic_launcher.png differ diff --git a/VectorTileMap/res/drawable-mdpi/ic_menu_mylocation.png b/TileMapApp/res/drawable-mdpi/ic_menu_mylocation.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/ic_menu_mylocation.png rename to TileMapApp/res/drawable-mdpi/ic_menu_mylocation.png diff --git a/VectorTileMap/res/drawable-mdpi/ic_menu_options.png b/TileMapApp/res/drawable-mdpi/ic_menu_options.png similarity index 100% rename from VectorTileMap/res/drawable-mdpi/ic_menu_options.png rename to TileMapApp/res/drawable-mdpi/ic_menu_options.png diff --git a/TileMapApp/res/drawable-mdpi/info.png b/TileMapApp/res/drawable-mdpi/info.png new file mode 100644 index 0000000..d7b7e69 Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/info.png differ diff --git a/TileMapApp/res/drawable-mdpi/moreinfo_arrow.png b/TileMapApp/res/drawable-mdpi/moreinfo_arrow.png new file mode 100644 index 0000000..04526cc Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/moreinfo_arrow.png differ diff --git a/TileMapApp/res/drawable-mdpi/moreinfo_arrow_pressed.png b/TileMapApp/res/drawable-mdpi/moreinfo_arrow_pressed.png new file mode 100644 index 0000000..5290161 Binary files /dev/null and b/TileMapApp/res/drawable-mdpi/moreinfo_arrow_pressed.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_departure.png b/TileMapApp/res/drawable-nodpi/marker_departure.png new file mode 100644 index 0000000..3a7eb97 Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_departure.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_destination.png b/TileMapApp/res/drawable-nodpi/marker_destination.png new file mode 100644 index 0000000..9b0afcf Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_destination.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_node.png b/TileMapApp/res/drawable-nodpi/marker_node.png new file mode 100644 index 0000000..c4546d5 Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_node.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_poi_default.png b/TileMapApp/res/drawable-nodpi/marker_poi_default.png new file mode 100644 index 0000000..6b8d1f1 Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_poi_default.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_poi_flickr.png b/TileMapApp/res/drawable-nodpi/marker_poi_flickr.png new file mode 100644 index 0000000..13d569a Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_poi_flickr.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_poi_picasa_24.png b/TileMapApp/res/drawable-nodpi/marker_poi_picasa_24.png new file mode 100644 index 0000000..1f7e91b Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_poi_picasa_24.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_poi_wikipedia_16.png b/TileMapApp/res/drawable-nodpi/marker_poi_wikipedia_16.png new file mode 100644 index 0000000..25cff18 Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_poi_wikipedia_16.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_poi_wikipedia_32.png b/TileMapApp/res/drawable-nodpi/marker_poi_wikipedia_32.png new file mode 100644 index 0000000..24c7767 Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_poi_wikipedia_32.png differ diff --git a/TileMapApp/res/drawable-nodpi/marker_via.png b/TileMapApp/res/drawable-nodpi/marker_via.png new file mode 100644 index 0000000..cbc2ca6 Binary files /dev/null and b/TileMapApp/res/drawable-nodpi/marker_via.png differ diff --git a/TileMapApp/res/drawable-xhdpi/ic_launcher.png b/TileMapApp/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..5e951fc Binary files /dev/null and b/TileMapApp/res/drawable-xhdpi/ic_launcher.png differ diff --git a/TileMapApp/res/drawable/btn_delete.xml b/TileMapApp/res/drawable/btn_delete.xml new file mode 100644 index 0000000..6e9bed3 --- /dev/null +++ b/TileMapApp/res/drawable/btn_delete.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/TileMapApp/res/drawable/btn_moreinfo.xml b/TileMapApp/res/drawable/btn_moreinfo.xml new file mode 100644 index 0000000..3dd8efd --- /dev/null +++ b/TileMapApp/res/drawable/btn_moreinfo.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/TileMapApp/res/drawable/globe2.png b/TileMapApp/res/drawable/globe2.png new file mode 100644 index 0000000..6d78802 Binary files /dev/null and b/TileMapApp/res/drawable/globe2.png differ diff --git a/VectorTileMap/res/layout/activity_file_picker.xml b/TileMapApp/res/layout/activity_file_picker.xml similarity index 100% rename from VectorTileMap/res/layout/activity_file_picker.xml rename to TileMapApp/res/layout/activity_file_picker.xml diff --git a/VectorTileMap/res/layout/activity_advanced_map_viewer.xml b/TileMapApp/res/layout/activity_tilemap.xml similarity index 66% rename from VectorTileMap/res/layout/activity_advanced_map_viewer.xml rename to TileMapApp/res/layout/activity_tilemap.xml index 0bddfd1..6df94e3 100644 --- a/VectorTileMap/res/layout/activity_advanced_map_viewer.xml +++ b/TileMapApp/res/layout/activity_tilemap.xml @@ -3,25 +3,24 @@ android:id="@+id/mainView" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:windowActionBarOverlay="true" - > + android:windowActionBarOverlay="true" > - + \ No newline at end of file diff --git a/TileMapApp/res/layout/bonuspack_bubble.xml b/TileMapApp/res/layout/bonuspack_bubble.xml new file mode 100644 index 0000000..4cbb9df --- /dev/null +++ b/TileMapApp/res/layout/bonuspack_bubble.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + +