Changeset 28696 in osm for applications/editors


Ignore:
Timestamp:
2012-09-08T19:09:04+02:00 (12 years ago)
Author:
donvip
Message:

[josm_opendata] Allow to split Toulouse data by sector/neighbourhood (admin level 10 and 11)

Location:
applications/editors/josm/plugins/opendata
Files:
2 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/opendata/.classpath

    r28296 r28696  
    1818        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    1919        <classpathentry kind="lib" path="/JOSM/dist/jts.jar"/>
     20        <classpathentry combineaccessrules="false" kind="src" path="/josm-utilsplugin2"/>
    2021        <classpathentry kind="output" path="bin"/>
    2122</classpath>

  • applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs

    r28000 r28696  
    1 #Mon Feb 06 20:04:14 CET 2012
    21eclipse.preferences.version=1
    32org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
    … …  
    8180org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
    8281org.eclipse.jdt.core.compiler.source=1.6
     82org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
     83org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
     84org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
     85org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
     86org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
     87org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
     88org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
     89org.eclipse.jdt.core.formatter.alignment_for_assignment=0
     90org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
     91org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
     92org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
     93org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
     94org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
     95org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
     96org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
     97org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
     98org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
     99org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
     100org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
     101org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
     102org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
     103org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
     104org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
     105org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
     106org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
     107org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
     108org.eclipse.jdt.core.formatter.blank_lines_after_package=1
     109org.eclipse.jdt.core.formatter.blank_lines_before_field=0
     110org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
     111org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
     112org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
     113org.eclipse.jdt.core.formatter.blank_lines_before_method=1
     114org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
     115org.eclipse.jdt.core.formatter.blank_lines_before_package=0
     116org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
     117org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
     118org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
     119org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
     120org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
     121org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
     122org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
     123org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
     124org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
     125org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
     126org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
     127org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
     128org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
     129org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
     130org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
     131org.eclipse.jdt.core.formatter.comment.format_block_comments=true
     132org.eclipse.jdt.core.formatter.comment.format_header=false
     133org.eclipse.jdt.core.formatter.comment.format_html=true
     134org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
     135org.eclipse.jdt.core.formatter.comment.format_line_comments=true
     136org.eclipse.jdt.core.formatter.comment.format_source_code=true
     137org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
     138org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
     139org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
     140org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
     141org.eclipse.jdt.core.formatter.comment.line_length=80
     142org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
     143org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
     144org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
     145org.eclipse.jdt.core.formatter.compact_else_if=true
     146org.eclipse.jdt.core.formatter.continuation_indentation=2
     147org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
     148org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
     149org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
     150org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
     151org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
     152org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
     153org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
     154org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
     155org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
     156org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
     157org.eclipse.jdt.core.formatter.indent_empty_lines=false
     158org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
     159org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
     160org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
     161org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
     162org.eclipse.jdt.core.formatter.indentation.size=4
     163org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
     164org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
     165org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
     166org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
     167org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
     168org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
     169org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
     170org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
     171org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
     172org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
     173org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
     174org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
     175org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
     176org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
     177org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
     178org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
     179org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
     180org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
     181org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
     182org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
     183org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
     184org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
     185org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
     186org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
     187org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
     188org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
     189org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
     190org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
     191org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
     192org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
     193org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
     194org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
     195org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
     196org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
     197org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
     198org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
     199org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
     200org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
     201org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
     202org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
     203org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
     204org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
     205org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
     206org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
     207org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
     208org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
     209org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
     210org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
     211org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
     212org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
     213org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
     214org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
     215org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
     216org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
     217org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
     218org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
     219org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
     220org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
     221org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
     222org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
     223org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
     224org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
     225org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
     226org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
     227org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
     228org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
     229org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
     230org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
     231org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
     232org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
     233org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
     234org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
     235org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
     236org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
     237org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
     238org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
     239org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
     240org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
     241org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
     242org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
     243org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
     244org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
     245org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
     246org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
     247org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
     248org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
     249org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
     250org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
     251org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
     252org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
     253org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
     254org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
     255org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
     256org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
     257org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
     258org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
     259org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
     260org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
     261org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
     262org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
     263org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
     264org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
     265org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
     266org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
     267org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
     268org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
     269org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
     270org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
     271org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
     272org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
     273org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
     274org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
     275org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
     276org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
     277org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
     278org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
     279org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
     280org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
     281org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
     282org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
     283org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
     284org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
     285org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
     286org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
     287org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
     288org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
     289org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
     290org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
     291org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
     292org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
     293org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
     294org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
     295org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
     296org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
     297org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
     298org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
     299org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
     300org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
     301org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
     302org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
     303org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
     304org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
     305org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
     306org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
     307org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
     308org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
     309org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
     310org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
     311org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
     312org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
     313org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
     314org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
     315org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
     316org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
     317org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
     318org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
     319org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
     320org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
     321org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
     322org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
     323org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
     324org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
     325org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
     326org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
     327org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
     328org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
     329org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
     330org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
     331org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
     332org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
     333org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
     334org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
     335org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
     336org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
     337org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
     338org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
     339org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
     340org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
     341org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
     342org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
     343org.eclipse.jdt.core.formatter.join_lines_in_comments=true
     344org.eclipse.jdt.core.formatter.join_wrapped_lines=true
     345org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
     346org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
     347org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
     348org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
     349org.eclipse.jdt.core.formatter.lineSplit=80
     350org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
     351org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
     352org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
     353org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
     354org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
     355org.eclipse.jdt.core.formatter.tabulation.char=space
     356org.eclipse.jdt.core.formatter.tabulation.size=4
     357org.eclipse.jdt.core.formatter.use_on_off_tags=false
     358org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
     359org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
     360org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
     361org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

  • applications/editors/josm/plugins/opendata/build.xml

    r28591 r28696  
    179179                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
    180180                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    181                 <attribute name="Plugin-Requires" value="jts"/>
     181                <attribute name="Plugin-Requires" value="jts;utilsplugin2"/>
    182182                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    183183            </manifest>

  • applications/editors/josm/plugins/opendata/modules/fr.toulouse/build.xml

    r28000 r28696  
    3030    <property name="plugin.dist.dir" value="../../../../dist"/>
    3131    <property name="opendata" location="${plugin.dist.dir}/opendata.jar"/>
     32    <property name="utilsplugin2" location="${plugin.dist.dir}/utilsplugin2.jar"/>
    3233    <property name="module.build.dir" value="build"/>
    3334    <property name="module.src.dir" value="src"/>
    … …  
    6465                <pathelement location="${josm}"/>
    6566                <pathelement location="${opendata}"/>
     67                <pathelement location="${utilsplugin2}"/>
    6668            </classpath>
    6769            <compilerarg value="-Xlint:deprecation"/>

  • applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java

    r28554 r28696  
    1616package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse;
    1717
     18import java.util.Collection;
     19import java.util.Comparator;
     20import java.util.TreeSet;
     21
     22import org.openstreetmap.josm.Main;
     23import org.openstreetmap.josm.data.osm.DataSet;
     24import org.openstreetmap.josm.data.osm.Relation;
     25import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
     26import org.openstreetmap.josm.io.OsmTransferException;
     27import org.openstreetmap.josm.plugins.opendata.core.io.NetworkReader;
    1828import org.openstreetmap.josm.plugins.opendata.core.modules.AbstractModule;
    1929import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation;
     30import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler;
    2031import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.associations.Club3eAgeHandler;
    2132import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.citoyennete.BureauxVoteHandler;
    … …  
    102113        handlers.add(InstallationSportiveToulouseHandler.class);
    103114    }
     115   
     116    public static final DataSet data = new DataSet();
     117   
     118    private static final Collection<Relation> getBoundaries(int admin_level) {
     119        Collection<Relation> result = new TreeSet<Relation>(new Comparator<Relation>() {
     120            @Override
     121            public int compare(Relation o1, Relation o2) {
     122                return o1.get("ref").compareTo(o2.get("ref"));
     123            }
     124        });
     125        synchronized (data) {
     126            for (Relation r : data.getRelations()) {
     127                if (r.hasTag("admin_level", Integer.toString(admin_level)) &&
     128                        (r.hasKey("name") || r.hasKey("ref") || r.hasKey("description"))) {
     129                    result.add(r);
     130                }
     131            }
     132        }
     133        return result;
     134    }
     135   
     136    public static final void downloadData() {
     137        synchronized (data) {
     138            if (data.allPrimitives().isEmpty()) {
     139                for (final ToulouseDataSetHandler handler : new ToulouseDataSetHandler[]{
     140                        new SecteursHandler(), new QuartiersHandler()}) {
     141                    Main.worker.submit(new Runnable() {
     142                        @Override
     143                        public void run() {
     144                            try {
     145                                DataSet ds = new NetworkReader(handler.getDataURL().toString(), handler, false).
     146                                        parseOsm(NullProgressMonitor.INSTANCE);
     147                                handler.updateDataSet(ds);
     148                                synchronized (data) {
     149                                    data.mergeFrom(ds);
     150                                }
     151                            } catch (OsmTransferException e) {
     152                                e.printStackTrace();
     153                            }
     154                        }
     155                    });
     156                }
     157            }
     158        }
     159    }
     160   
     161    public static final Collection<Relation> getSectors() {
     162        return getBoundaries(10);
     163    }
     164
     165    public static final Collection<Relation> getNeighbourhoods() {
     166        return getBoundaries(11);
     167    }
    104168}

  • applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java

    r28554 r28696  
    1616package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets;
    1717
     18import static org.openstreetmap.josm.tools.I18n.marktr;
     19import static org.openstreetmap.josm.tools.I18n.tr;
     20
     21import java.awt.event.ActionEvent;
    1822import java.net.MalformedURLException;
    19 
     23import java.util.Collection;
     24import java.util.Collections;
     25
     26import org.openstreetmap.josm.Main;
     27import org.openstreetmap.josm.actions.JosmAction;
     28import org.openstreetmap.josm.data.osm.DataSet;
     29import org.openstreetmap.josm.data.osm.Node;
     30import org.openstreetmap.josm.data.osm.OsmPrimitive;
     31import org.openstreetmap.josm.data.osm.Relation;
    2032import org.openstreetmap.josm.data.osm.Tag;
     33import org.openstreetmap.josm.data.osm.Way;
     34import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
     35import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
     36import org.openstreetmap.josm.data.osm.event.DataSetListener;
     37import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
     38import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
     39import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
     40import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
     41import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
     42import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
     43import org.openstreetmap.josm.plugins.opendata.OdPlugin;
    2144import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler;
     45import org.openstreetmap.josm.plugins.opendata.core.layers.OdDataLayer;
    2246import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.ToulouseConstants;
    2347import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.ToulouseLicense;
     48import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.ToulouseModule;
     49import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
    2450
    2551public abstract class ToulouseDataSetHandler extends FrenchDataSetHandler implements ToulouseConstants {
    … …  
    6692                setDataURL(url+"/resource/document");
    6793            }
     94            addTool(new SplitBySector());
     95            addTool(new SplitByNeighbourhood());
    6896        } catch (MalformedURLException e) {
    6997            e.printStackTrace();
    … …  
    105133        }
    106134    }
     135   
     136    protected abstract class SplitAction extends JosmAction implements DataSetListener {
     137       
     138        public SplitAction(String name, String desc) {
     139            super(name, null, desc, null, false);
     140            setEnabled(false);
     141            ToulouseModule.data.addDataSetListener(this);
     142        }
     143       
     144        protected abstract Collection<Relation> getBoundaries();
     145       
     146        @Override
     147        public void actionPerformed(ActionEvent e) {
     148            final String baseName = OdPlugin.getInstance().getDialog().getDataLayer().getName();
     149            final DataSet baseDs = getCurrentDataSet();
     150            for (OsmPrimitive boundary : getBoundaries()) {
     151                DataSet data = new DataSet();
     152                for (OsmPrimitive p : NodeWayUtils.selectAllInside(Collections.singleton(boundary), baseDs)) {
     153                    if (p instanceof Node) {
     154                        data.addPrimitive(new Node((Node)p));
     155                    } else if (p instanceof Way) {
     156                        data.addPrimitive(new Way((Way)p));
     157                    } else if (p instanceof Relation) {
     158                        data.addPrimitive(new Relation((Relation)p));
     159                    }
     160                }
     161                Main.main.addLayer(new OdDataLayer(data, baseName+"/"+boundary.get("ref"), null, ToulouseDataSetHandler.this));
     162            }
     163        }
     164        @Override
     165        public void dataChanged(DataChangedEvent event) {
     166            setEnabled(!getBoundaries().isEmpty());
     167        }
     168        @Override
     169        public void primitivesAdded(PrimitivesAddedEvent event) {
     170        }
     171        @Override
     172        public void primitivesRemoved(PrimitivesRemovedEvent event) {
     173        }
     174        @Override
     175        public void tagsChanged(TagsChangedEvent event) {
     176        }
     177        @Override
     178        public void nodeMoved(NodeMovedEvent event) {
     179        }
     180        @Override
     181        public void wayNodesChanged(WayNodesChangedEvent event) {
     182        }
     183        @Override
     184        public void relationMembersChanged(RelationMembersChangedEvent event) {
     185        }
     186        @Override
     187        public void otherDatasetChange(AbstractDatasetChangedEvent event) {
     188        }
     189    }
     190   
     191    protected class SplitBySector extends SplitAction {
     192        public SplitBySector() {
     193            super(marktr("Split by sector"), tr("Split this data by sector (admin_level=10)."));
     194        }
     195        @Override
     196        protected Collection<Relation> getBoundaries() {
     197            return ToulouseModule.getSectors();
     198        }
     199    }
     200
     201    protected class SplitByNeighbourhood extends SplitAction {
     202        public SplitByNeighbourhood() {
     203            super(marktr("Split by neighbourhood"), tr("Split this data by neighbourhood (admin_level=11)."));
     204        }
     205        @Override
     206        protected Collection<Relation> getBoundaries() {
     207            return ToulouseModule.getNeighbourhoods();
     208        }
     209    }
     210
     211    @Override
     212    public void notifyActive() {
     213        ToulouseModule.downloadData();
     214    }
    107215}

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

    r28246 r28696  
    7070        private final JMenu menu;
    7171       
     72        private OdDialog dialog;
     73       
    7274        public OdPlugin(PluginInformation info) { // NO_UCD
    7375                super(info);
    … …  
    167169        public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
    168170                if (newFrame != null) {
    169                         newFrame.addToggleDialog(new OdDialog());
     171                        newFrame.addToggleDialog(dialog = new OdDialog());
     172                } else {
     173                    dialog = null;
    170174                }
    171175        }
    … …  
    203207    public final File getResourcesDirectory() {
    204208        return getSubDirectory("resources");
     209    }
     210
     211    public OdDialog getDialog() {
     212        return dialog;
    205213    }
    206214

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java

    r28143 r28696  
    5353        @Override
    5454        public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
    55         downloadTask = new InternalDownloadTasK(newLayer, new NetworkReader(url, handler), progressMonitor);
     55        downloadTask = new InternalDownloadTasK(newLayer, new NetworkReader(url, handler, true), progressMonitor);
    5656        currentBounds = null;
    5757        if (handler == null || !handler.hasLicenseToBeAccepted() || askLicenseAgreement(handler.getLicense())) {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java

    r28191 r28696  
    2424import java.util.regex.Pattern;
    2525
     26import org.openstreetmap.josm.actions.JosmAction;
    2627import org.openstreetmap.josm.data.Bounds;
    2728import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    478479                }
    479480        }
     481       
     482        // Tools
     483
     484        private final Collection<JosmAction> tools = new ArrayList<JosmAction>();
     485       
     486        public final Collection<JosmAction> getTools() {
     487            return tools;
     488        }
     489       
     490        public final boolean addTool(JosmAction tool) {
     491        return tool != null ? tools.add(tool) : false;
     492        }
     493       
     494        public final boolean removeTool(JosmAction tool) {
     495            return tool != null ? tools.remove(tool) : false;
     496        }
     497
     498    public void notifyActive() {
     499        // To be overriden when the handler has specific treatments to perform when its layer becomes active
     500    }
    480501}

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java

    r28616 r28696  
    66import java.awt.event.ActionEvent;
    77import java.awt.event.KeyEvent;
     8import java.awt.event.MouseAdapter;
     9import java.awt.event.MouseEvent;
    810import java.util.Arrays;
    911import java.util.List;
    1012
     13import javax.swing.JPopupMenu;
    1114import javax.swing.JTree;
    1215import javax.swing.tree.DefaultTreeModel;
    … …  
    2326import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    2427import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
    25 import org.openstreetmap.josm.plugins.opendata.core.actions.ToolsAction;
    2628import org.openstreetmap.josm.plugins.opendata.core.layers.OdDataLayer;
    2729import org.openstreetmap.josm.plugins.opendata.core.layers.OdLayer;
    … …  
    7678                }
    7779    }
     80   
     81    private class ToolsAction extends JosmAction {
     82        public ToolsAction() {
     83            super(marktr("Tools"), "dialogs/utils", tr("Open tools menu for this data."), null, false);
     84        }
     85        @Override
     86        public void actionPerformed(ActionEvent e) {
     87            // Done via mouseListener
     88        }
     89    }
    7890
    7991        public OdDialog() {
    … …  
    8799                                diffButton = new SideButton(new DiffAction()),
    88100                                toolsButton = new SideButton(new ToolsAction())
     101        });
     102               
     103                this.toolsButton.addMouseListener(new MouseAdapter() {
     104                    @Override
     105                    public void mousePressed(MouseEvent e) {
     106                    if (Main.main.getEditLayer() instanceof OdLayer) {
     107                    JPopupMenu popup = new JPopupMenu();
     108                        for (JosmAction tool : dataLayer.handler.getTools()) {
     109                            popup.add(tool);
     110                        }
     111                    popup.show(e.getComponent(), e.getX(), e.getY());
     112                    }
     113                    }
    89114        });
    90115               
    … …  
    124149                                diffButton.setEnabled(true);
    125150                        }
     151                        toolsButton.setEnabled(dataLayer.handler != null && !dataLayer.handler.getTools().isEmpty());
    126152                } else {
    127153                        disableAllButtons();
    … …  
    143169        MapView.removeEditLayerChangeListener(this);
    144170    }
     171
     172    public OdDataLayer getDataLayer() {
     173        return dataLayer;
     174    }
    145175}

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java

    r28191 r28696  
    4747        private final AbstractDataSetHandler handler;
    4848        private Class<? extends AbstractReader> readerClass;
     49        private final boolean promptUser;
    4950
    5051        private File file;
    5152        private String filename;
    5253       
    53     public NetworkReader(String url, AbstractDataSetHandler handler) {
     54    public NetworkReader(String url, AbstractDataSetHandler handler, boolean promptUser) {
    5455        CheckParameterUtil.ensureParameterNotNull(url, "url");
    5556        this.url = url;
    5657        this.handler = handler;
    5758        this.readerClass = null;
     59        this.promptUser = promptUser;
    5860    }
    5961   
    … …  
    150152            instance = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
    151153            if (readerClass.equals(ZipReader.class)) {
    152                 ZipReader zipReader = new ZipReader(in, handler);
     154                ZipReader zipReader = new ZipReader(in, handler, promptUser);
    153155                DataSet ds = zipReader.parseDoc(instance);
    154156                file = zipReader.getReadFile();

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java

    r28000 r28696  
    3333                        throws IllegalDataException {
    3434                try {
    35                         return ZipReader.parseDataSet(in, handler, instance);
     35                        return ZipReader.parseDataSet(in, handler, instance, true);
    3636                } catch (Exception e) {
    3737                        throw new IllegalDataException(e);

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java

    r28374 r28696  
    5555        private final AbstractDataSetHandler handler;
    5656        private final ZipHandler zipHandler;
     57        private final boolean promptUser;
    5758       
    5859        private File file;
    5960   
    60     public ZipReader(InputStream in, AbstractDataSetHandler handler) {
     61    public ZipReader(InputStream in, AbstractDataSetHandler handler, boolean promptUser) {
    6162        this.zis = in instanceof ZipInputStream ? (ZipInputStream) in : new ZipInputStream(in);
    6263        this.handler = handler;
    6364        this.zipHandler = handler != null ? handler.getZipHandler() : null;
     65        this.promptUser = promptUser;
    6466    }
    6567
    66         public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
    67                 return new ZipReader(in, handler).parseDoc(instance);
     68        public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
     69                throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     70                return new ZipReader(in, handler, promptUser).parseDoc(instance);
    6871        }
    6972       
    … …  
    156159                        file = null;
    157160                       
    158                         if (candidates.size() > 1) {
     161                        if (promptUser && candidates.size() > 1) {
    159162                                DialogPrompter<CandidateChooser> prompt = new DialogPrompter() {
    160163                                        @Override
    … …  
    166169                                        file = prompt.getDialog().getSelectedFile();
    167170                                }
    168                         } else if (candidates.size() == 1) {
     171                        } else if (!candidates.isEmpty()) {
    169172                                file = candidates.get(0);
    170173                        }

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

    r28185 r28696  
    115115        @Override
    116116        public void activeLayerChange(Layer oldLayer, Layer newLayer) {
     117            if (newLayer == this && this.handler != null) {
     118                this.handler.notifyActive();
     119            }
    117120        }
    118121
Note: See TracChangeset for help on using the changeset viewer.